Skip to content

Commit

Permalink
Unify the page and wrench menus into one wrench menu. Remove pref to …
Browse files Browse the repository at this point in the history 
…hide menu.

Nib updates:
Toolbar.xib: Removed page menu and moved everything over to accomodate.
Prefs.xib: Removed "show options page/wrench menu" checkbox and moved everything up to accomodate.
BUG=45756
TEST=migration from having the pref hidden. It should become visible.
Review URL: http://codereview.chromium.org/2828005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49830 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
pinkerton@chromium.org committed Jun 15, 2010
1 parent 85c5252 commit c0e279e
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 289 deletions.
119 changes: 22 additions & 97 deletions chrome/app/nibs/Preferences.xib
View file

Large diffs are not rendered by default.

72 changes: 4 additions & 68 deletions chrome/app/nibs/Toolbar.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
<object class="NSCustomView" id="421615633">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">-2147483383</int>
<string key="NSFrame">{{540, 0}, {0.777771, 36}}</string>
<string key="NSFrame">{{574, 0}, {0.777771, 36}}</string>
<reference key="NSSuperview" ref="928520650"/>
<string key="NSClassName">BrowserActionsContainerView</string>
</object>
<object class="NSTextField" id="535508469">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{136, 5}, {401, 27}}</string>
<string key="NSFrame">{{136, 5}, {435, 27}}</string>
<reference key="NSSuperview" ref="928520650"/>
<int key="NSTag">33004</int>
<bool key="NSEnabled">YES</bool>
Expand Down Expand Up @@ -190,30 +190,6 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSButton" id="571076484">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{540, 5}, {35, 27}}</string>
<reference key="NSSuperview" ref="928520650"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482050975">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134250496</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="64724822"/>
<reference key="NSControlView" ref="571076484"/>
<int key="NSButtonFlags">141312255</int>
<int key="NSButtonFlags2">134</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">menu_page_Template</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSButton" id="602421009">
<reference key="NSNextResponder" ref="928520650"/>
<int key="NSvFlags">265</int>
Expand All @@ -230,7 +206,7 @@
<int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">menu_chrome_Template</string>
<string key="NSResourceName">NSActionTemplate</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand Down Expand Up @@ -317,14 +293,6 @@
</object>
<int key="connectionID">35</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">pageButton_</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="571076484"/>
</object>
<int key="connectionID">40</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">wrenchButton_</string>
Expand Down Expand Up @@ -414,7 +382,6 @@
<reference ref="781044416"/>
<reference ref="368496192"/>
<reference ref="602421009"/>
<reference ref="571076484"/>
<reference ref="421615633"/>
</object>
<reference key="parent" ref="588411309"/>
Expand Down Expand Up @@ -489,20 +456,6 @@
<reference key="object" ref="697431051"/>
<reference key="parent" ref="634265909"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">36</int>
<reference key="object" ref="571076484"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="482050975"/>
</object>
<reference key="parent" ref="928520650"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">37</int>
<reference key="object" ref="482050975"/>
<reference key="parent" ref="571076484"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">38</int>
<reference key="object" ref="602421009"/>
Expand Down Expand Up @@ -561,11 +514,6 @@
<string>2.IBPluginDependency</string>
<string>3.IBAttributePlaceholdersKey</string>
<string>3.IBPluginDependency</string>
<string>36.CustomClassName</string>
<string>36.IBAttributePlaceholdersKey</string>
<string>36.IBPluginDependency</string>
<string>37.CustomClassName</string>
<string>37.IBPluginDependency</string>
<string>38.CustomClassName</string>
<string>38.IBAttributePlaceholdersKey</string>
<string>38.IBPluginDependency</string>
Expand All @@ -586,7 +534,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{322, 542}, {618, 36}}</string>
<string>{{175, 552}, {618, 36}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>ClickHoldButtonCell</string>
Expand Down Expand Up @@ -620,18 +568,6 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>MenuButton</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="571076484"/>
<string key="toolTip">^IDS_PAGEMENU_TOOLTIP</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>ClickHoldButtonCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>MenuButton</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/cocoa/preferences_window_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class ProfileSyncService;
BooleanPrefMember newTabPageIsHomePage_;
StringPrefMember homepage_;
BooleanPrefMember showHomeButton_;
BooleanPrefMember showPageOptionButtons_;
scoped_nsobject<SearchEngineListModel> searchEngineModel_;
// Used when creating a new home page url to make the new cell editable.
BOOL pendingSelectForEdit_;
Expand Down
25 changes: 0 additions & 25 deletions chrome/browser/cocoa/preferences_window_controller.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@ - (void)setNewTabPageIsHomePageIndex:(NSInteger)val;
- (void)setHomepageURL:(NSString*)urlString;
- (void)setRestoreOnStartupIndex:(NSInteger)type;
- (void)setShowHomeButton:(BOOL)value;
- (void)setShowPageOptionsButtons:(BOOL)value;
- (void)setPasswordManagerEnabledIndex:(NSInteger)value;
- (void)setFormAutofillEnabledIndex:(NSInteger)value;
- (void)setIsUsingDefaultTheme:(BOOL)value;
Expand Down Expand Up @@ -695,8 +694,6 @@ - (void)registerPrefObservers {
prefs_, observer_.get());
homepage_.Init(prefs::kHomePage, prefs_, observer_.get());
showHomeButton_.Init(prefs::kShowHomeButton, prefs_, observer_.get());
showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs_,
observer_.get());

// Personal Stuff panel
askSavePasswords_.Init(prefs::kPasswordManagerEnabled,
Expand Down Expand Up @@ -870,10 +867,6 @@ - (void)basicsPrefChanged:(std::wstring*)prefName {
if (*prefName == prefs::kShowHomeButton) {
[self setShowHomeButton:showHomeButton_.GetValue() ? YES : NO];
}
if (*prefName == prefs::kShowPageOptionsButtons) {
[self setShowPageOptionsButtons:showPageOptionButtons_.GetValue() ?
YES : NO];
}
}

// Returns the index of the selected cell in the "on startup" matrix based
Expand Down Expand Up @@ -1061,24 +1054,6 @@ - (void)setShowHomeButton:(BOOL)value {
showHomeButton_.SetValue(value ? true : false);
}

// Returns whether the page and options button should be checked based on the
// preference.
- (BOOL)showPageOptionsButtons {
return showPageOptionButtons_.GetValue() ? YES : NO;
}

// Sets the backend pref for whether or not the page and options buttons should
// be displayed based on |value|.
- (void)setShowPageOptionsButtons:(BOOL)value {
if (value)
[self recordUserAction:UserMetricsAction(
"Options_Homepage_ShowPageOptionsButtons")];
else
[self recordUserAction:UserMetricsAction(
"Options_Homepage_HidePageOptionsButtons")];
showPageOptionButtons_.SetValue(value ? true : false);
}

// Getter for the |searchEngineModel| property for bindings.
- (id)searchEngineModel {
return searchEngineModel_.get();
Expand Down
17 changes: 6 additions & 11 deletions chrome/browser/cocoa/toolbar_controller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#import "chrome/browser/cocoa/view_resizer.h"
#include "chrome/browser/pref_member.h"

class AppMenuModel;
@class AutocompleteTextField;
@class AutocompleteTextFieldEditor;
@class BrowserActionsContainerView;
Expand All @@ -28,14 +27,14 @@ class LocationBar;
class LocationBarViewMac;
@class MenuButton;
@class MenuController;
class PageMenuModel;
namespace ToolbarControllerInternal {
class MenuDelegate;
class PrefObserverBridge;
}
class Profile;
class TabContents;
class ToolbarModel;
class WrenchMenuModel;

// A controller for the toolbar in the browser window. Manages
// updating the state for location bar and back/fwd/reload/go buttons.
Expand All @@ -52,7 +51,6 @@ class ToolbarModel;
IBOutlet DelayedMenuButton* forwardButton_;
IBOutlet NSButton* reloadButton_;
IBOutlet NSButton* homeButton_;
IBOutlet MenuButton* pageButton_;
IBOutlet MenuButton* wrenchButton_;
IBOutlet AutocompleteTextField* locationBar_;
IBOutlet BrowserActionsContainerView* browserActionsContainerView_;
Expand All @@ -71,14 +69,11 @@ class ToolbarModel;
scoped_nsobject<BrowserActionsController> browserActionsController_;

// Lazily-instantiated model, controller, and delegate for the menu on the
// page and wrench buttons. The wrench menu is also called the "app menu". If
// it's visible, these will be non-null, but they are not reaped when the
// button is hidden once it is initially shown.
scoped_ptr<PageMenuModel> pageMenuModel_;
scoped_nsobject<MenuController> pageMenuController_;
// wrench button. Once visible, it will be non-null, but will not
// reaped when the menu is hidden once it is initially shown.
scoped_ptr<ToolbarControllerInternal::MenuDelegate> menuDelegate_;
scoped_ptr<AppMenuModel> appMenuModel_;
scoped_nsobject<MenuController> appMenuController_;
scoped_ptr<WrenchMenuModel> wrenchMenuModel_;
scoped_nsobject<MenuController> wrenchMenuController_;

// Used for monitoring the optional toolbar button prefs.
scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
Expand Down Expand Up @@ -180,7 +175,7 @@ class ToolbarModel;
// Returns an array of views in the order of the outlets above.
- (NSArray*)toolbarViews;
- (void)showOptionalHomeButton;
- (void)showOptionalPageWrenchButtons;
- (void)installWrenchMenu;
// Return a hover button for the current event.
- (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
@end
Expand Down
Loading

0 comments on commit c0e279e

Please sign in to comment.