diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 14:05:27 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 14:05:27 +0000 |
| commit | ec453fbed5e3047ef3b0e546e99a9e48786b8845 (patch) | |
| tree | 73f71d76e4d0851acd77cbbe9464958af17c97de /chrome/browser/policy | |
| parent | 29b7b3006b1a3b6dc375d3f1f60f9713b3f2c656 (diff) | |
| download | chromium_src-ec453fbed5e3047ef3b0e546e99a9e48786b8845.zip chromium_src-ec453fbed5e3047ef3b0e546e99a9e48786b8845.tar.gz chromium_src-ec453fbed5e3047ef3b0e546e99a9e48786b8845.tar.bz2 | |
Move LaunchContainer enum to extension_constants.h.
Move the Chrome-specific LaunchContainer enum out of
extensions/common/constants.h and into
chrome/common/extensions/extension_constants.h (it can't
live under chrome/browser/extensions since it's used by
AppLaunchInfo). For consistency, also move the LaunchType
enum to extension_constants.h.
Rename LaunchContainer's values from LAUNCH_* to
LAUNCH_CONTAINER_*, and also rename the LAUNCH_TYPE_* values
in AppContextMenu to USE_LAUNCH_TYPE_* to avoid confusion
with the LaunchType enum.
BUG=180083
TBR=sky@chromium.org,jar@chromium.org
Review URL: https://codereview.chromium.org/106713002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/policy_browsertest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index f9bfddd..f5453db 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -2054,8 +2054,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedApp) { // Launch an app that tries to open a fullscreen window. TestAddShellWindowObserver add_window_observer( apps::ShellWindowRegistry::Get(browser()->profile())); - OpenApplication(AppLaunchParams(browser()->profile(), extension, - extensions::LAUNCH_NONE, NEW_WINDOW)); + OpenApplication(AppLaunchParams(browser()->profile(), + extension, + extensions::LAUNCH_CONTAINER_NONE, + NEW_WINDOW)); apps::ShellWindow* window = add_window_observer.WaitForShellWindow(); ASSERT_TRUE(window); |