summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.h
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-21 00:55:11 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-21 00:55:11 +0000
commitd630d7d5201ca362182634b8235b50af631a0b5a (patch)
treeaa65e7601ccc37d3d1af5dcbd955ec622ccba1c2 /chrome/browser/app_controller_mac.h
parent65697fcd4eb2afbef1cf11bd8d30617ac3f9c2d4 (diff)
downloadchromium_src-d630d7d5201ca362182634b8235b50af631a0b5a.zip
chromium_src-d630d7d5201ca362182634b8235b50af631a0b5a.tar.gz
chromium_src-d630d7d5201ca362182634b8235b50af631a0b5a.tar.bz2
Mac: when only minimized windows present, various commands should unminimize ...
... and use an existing window rather than create a new one. Also, when a dialog box (e.g., Preferences, Bookmark Manager, etc.) is active, those commands should activate an existing window (if one exists) instead of always creating a new window. The complete list of commands which should activate a miniaturized window if possible (otherwise create a new window): - File->New Tab (Cmd-T) - File->Open Location... (Cmd-L) - Edit->Find->Search the Web... (Opt-Cmd-F) - History->History (Cmd-Y) - Window->Downloads (Shift-Cmd-J) - Window->Extensions - Help->Chromium/Google Chrome Help For now, I'm letting File->Open File... (Cmd-O) always create a new window, which is consistent with Safari. BUG=21434 TEST=Close all windows; try one of the commands above (in commit message/CL description); a new window should be created and the command should work; this is all as before this CL. Create a window (if necessary) and minimize all browser windows; try one of the commands above; the last-active browser window should unminimize and the command should execute in that window. Review URL: http://codereview.chromium.org/652018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.h')
-rw-r--r--chrome/browser/app_controller_mac.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 19cfcf6..11f705f 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -35,8 +35,8 @@ class Profile;
// If we're told to open URLs (in particular, via |-application:openFiles:| by
// Launch Services) before we've launched the browser, we queue them up in
- // |startupURLs_| so that they can go in the first browser window/tab.
- std::vector<GURL> startupURLs_;
+ // |startupUrls_| so that they can go in the first browser window/tab.
+ std::vector<GURL> startupUrls_;
BOOL startupComplete_;
// Outlets for the close tab/window menu items so that we can adjust the
@@ -68,10 +68,10 @@ class Profile;
- (NSMenu*)applicationDockMenu:(NSApplication*)sender;
// Get the URLs that Launch Services expects the browser to open at startup.
-- (const std::vector<GURL>&)startupURLs;
+- (const std::vector<GURL>&)startupUrls;
// Clear the list of startup URLs.
-- (void)clearStartupURLs;
+- (void)clearStartupUrls;
@end