diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 01:48:33 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 01:48:33 +0000 |
| commit | 8e837ecd0f4983e7b76f017ac847e3856d30f49d (patch) | |
| tree | 4e97a1df00b64f1e70932cd6df9893735cd1c07b /chrome/browser/ui/ash/chrome_shell_delegate.cc | |
| parent | ce24bcddc880734fbeba6861f1e51e5a2365febc (diff) | |
| download | chromium_src-8e837ecd0f4983e7b76f017ac847e3856d30f49d.zip chromium_src-8e837ecd0f4983e7b76f017ac847e3856d30f49d.tar.gz chromium_src-8e837ecd0f4983e7b76f017ac847e3856d30f49d.tar.bz2 | |
Made launcher hidden when kicking off chrome in app mode.
A new switch --force-app-mode has been added for this purpose. On ChromeOS, this switch will also force app install in the next CL.
BUG=172988, 173008
TEST=none
Review URL: https://codereview.chromium.org/12077055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/ash/chrome_shell_delegate.cc')
| -rw-r--r-- | chrome/browser/ui/ash/chrome_shell_delegate.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index b6ee520..d2e3d25 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -12,6 +12,7 @@ #include "ash/wm/window_util.h" #include "base/bind.h" #include "base/command_line.h" +#include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" @@ -584,6 +585,10 @@ double ChromeShellDelegate::GetSavedScreenMagnifierScale() { ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { DCHECK(launcher_delegate_); + // Don't show context menu for exclusive app runtime mode. + if (chrome::IsRunningInAppMode()) + return NULL; + return new LauncherContextMenu(launcher_delegate_, root); } |