diff options
author | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 08:14:07 +0000 |
---|---|---|
committer | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 08:14:07 +0000 |
commit | d100d683a0154283dd37703939f9c6e38db720ca (patch) | |
tree | 8d59c74bf7451d602916dad0c9352dfc20bc7a59 | |
parent | 95b48073fa3dc20eb755f302e6bde3fd60fea898 (diff) | |
download | chromium_src-d100d683a0154283dd37703939f9c6e38db720ca.zip chromium_src-d100d683a0154283dd37703939f9c6e38db720ca.tar.gz chromium_src-d100d683a0154283dd37703939f9c6e38db720ca.tar.bz2 |
[Mac] Don't relaunch apps from the Chrome dock icon.
This makes the Chrome dock icon always represent Chrome. I.e. when launched
with --app-id, Chrome starts the app, but clicking on the Chrome dock icon
will open a browser window.
BUG=148465, 370311
Review URL: https://codereview.chromium.org/267923006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270629 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/app_controller_mac.mm | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index e795c26..b863936 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -1221,26 +1221,6 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver { } } - // Platform apps don't use browser windows so don't do anything if there are - // visible windows, otherwise, launch the browser with the same command line - // which should launch the app again. - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kAppId)) { - if (hasVisibleWindows) - return YES; - - { - base::AutoReset<bool> auto_reset_in_run(&g_is_opening_new_window, true); - int return_code; - StartupBrowserCreator browser_creator; - browser_creator.LaunchBrowser( - command_line, [self lastProfile], base::FilePath(), - chrome::startup::IS_NOT_PROCESS_STARTUP, - chrome::startup::IS_NOT_FIRST_RUN, &return_code); - } - return NO; - } - // Otherwise open a new window. // If the last profile was locked, we have to open the User Manager, as the // profile requires authentication. Similarly, because guest mode is |