diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 19:53:14 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 19:53:14 +0000 |
| commit | 6f91e5aefeedae6b7ecbce99ff7bbe149fbb8bd1 (patch) | |
| tree | d39d54e9dc3e68612e206610fba1e4ad051c38ae /chrome/browser | |
| parent | 3a5e64134c7a859ab8678aef2e83a205d2c4464d (diff) | |
| download | chromium_src-6f91e5aefeedae6b7ecbce99ff7bbe149fbb8bd1.zip chromium_src-6f91e5aefeedae6b7ecbce99ff7bbe149fbb8bd1.tar.gz chromium_src-6f91e5aefeedae6b7ecbce99ff7bbe149fbb8bd1.tar.bz2 | |
[Mac] Remove a dead ivar and minor style conformance.
BUG=73011
TEST=none
Review URL: http://codereview.chromium.org/6718002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/app_controller_mac.h | 2 | ||||
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index 02a55b0..d80daea 100644 --- a/chrome/browser/app_controller_mac.h +++ b/chrome/browser/app_controller_mac.h @@ -18,7 +18,6 @@ class BookmarkMenuBridge; class CommandUpdater; class GURL; class HistoryMenuBridge; -@class PreferencesWindowController; class Profile; // The application controller object, created by loading the MainMenu nib. @@ -32,7 +31,6 @@ class Profile; // (and Browser*s). scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; scoped_ptr<HistoryMenuBridge> historyMenuBridge_; - PreferencesWindowController* prefsController_; // Weak. AboutWindowController* aboutController_; // Weak. // If we're told to open URLs (in particular, via |-application:openFiles:| by diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index b192438..c4de5e4 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -306,7 +306,6 @@ void RecordLastRunAppBundlePath() { BrowserList::EndKeepAlive(); // Close these off if they have open windows. - [prefsController_ close]; [aboutController_ close]; [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -498,11 +497,11 @@ void RecordLastRunAppBundlePath() { // current locale (see http://crbug.com/7647 for details). // We need a valid g_browser_process to get the profile which is why we can't // call this from awakeFromNib. - NSMenu* view_menu = [[[NSApp mainMenu] itemWithTag:IDC_VIEW_MENU] submenu]; - NSMenuItem* encoding_menu_item = [view_menu itemWithTag:IDC_ENCODING_MENU]; - NSMenu* encoding_menu = [encoding_menu_item submenu]; + NSMenu* viewMenu = [[[NSApp mainMenu] itemWithTag:IDC_VIEW_MENU] submenu]; + NSMenuItem* encodingMenuItem = [viewMenu itemWithTag:IDC_ENCODING_MENU]; + NSMenu* encodingMenu = [encodingMenuItem submenu]; EncodingMenuControllerDelegate::BuildEncodingMenu([self defaultProfile], - encoding_menu); + encodingMenu); // Since Chrome is localized to more languages than the OS, tell Cocoa which // menu is the Help so it can add the search item to it. |