diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 23:25:06 +0000 |
| commit | 45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f (patch) | |
| tree | cffc5e3be784e5fcebe2d6390055d9b010df3c46 /chrome/browser/extensions/window_open_apitest.cc | |
| parent | 93f942621d858fdae51cdecf3d2f234967b671aa (diff) | |
| download | chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.zip chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.gz chromium_src-45c2428c0c3b8bda0f40aac07d1ef0f27e35fe2f.tar.bz2 | |
Revert 270232 "linux_aura: Compile ash into chrome."
Reverted once again because because there are two more static initializers.
> linux_aura: Compile ash into chrome.
>
> [This is a reland now that the static initializers should be fixed.]
>
> Running chrome with the "--open-ash" parameter will create an ash
> desktop window. Ash on Linux has some problems, but at least we're now
> compiling the code into the binary.
>
> TODO: The applist isn't positioned correctly, and some details of the
> system tray aren't correct.
>
> BUG=300084, 303862
> TBR=sky@chromium.org
> First Review URL: https://codereview.chromium.org/25108005
>
> Review URL: https://codereview.chromium.org/270383007
TBR=erg@chromium.org
Review URL: https://codereview.chromium.org/287783002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/window_open_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/window_open_apitest.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 90bfdae..b50247a 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -35,7 +35,7 @@ #include "apps/app_window_registry.h" #endif -#if defined(USE_ASH) && defined(OS_CHROMEOS) +#if defined(USE_ASH) && !defined(OS_WIN) // TODO(stevenjb): Figure out the correct behavior for Ash + Win #define USE_ASH_PANELS #endif @@ -273,16 +273,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanelDetached) { ASSERT_TRUE(RunExtensionTest("window_open/panel_detached")) << message_; } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -// TODO(erg): Bring up ash http://crbug.com/300084 -#define MAYBE_CloseNonExtensionPanelsOnUninstall \ - DISABLED_CloseNonExtensionPanelsOnUninstall -#else -#define MAYBE_CloseNonExtensionPanelsOnUninstall \ - CloseNonExtensionPanelsOnUninstall -#endif IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, - MAYBE_CloseNonExtensionPanelsOnUninstall) { + CloseNonExtensionPanelsOnUninstall) { #if defined(OS_WIN) && defined(USE_ASH) // Disable this test in Metro+Ash for now (http://crbug.com/262796). if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) @@ -353,8 +345,8 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, EXPECT_TRUE(WaitForTabsAndPopups(browser(), 1, num_popups, 0)); } -// This test isn't applicable on Chrome OS, which automatically reloads crashed -// pages. +// This test isn't applicable on Chrome OS, which automatically reloads +// crashed pages. #if !defined(OS_CHROMEOS) IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, ClosePanelsOnExtensionCrash) { #if defined(USE_ASH_PANELS) |