diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:09:26 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 03:09:26 +0000 |
| commit | 8d3fa5ee110654c60722e33c414093fbc8a1ae94 (patch) | |
| tree | 422c27ebdc81e63472541c873a4a3a6e62806435 /chrome/browser/chromeos/panels | |
| parent | 489d1a8055c3ed8389630cd537999a6715eaa4a5 (diff) | |
| download | chromium_src-8d3fa5ee110654c60722e33c414093fbc8a1ae94.zip chromium_src-8d3fa5ee110654c60722e33c414093fbc8a1ae94.tar.gz chromium_src-8d3fa5ee110654c60722e33c414093fbc8a1ae94.tar.bz2 | |
This compiles out IPC under Aura. I have built and run chromeos with and without these #ifdef.
TBR=davemoore@chromium.org
BUG=97131,99488
TEST=none
Review URL: http://codereview.chromium.org/8218023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/panels')
| -rw-r--r-- | chrome/browser/chromeos/panels/panel_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index 961446f..5e47953 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" @@ -13,6 +12,10 @@ #include "content/browser/renderer_host/render_view_host.h" #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" +#if defined(TOOLKIT_USES_GTK) +#include "chrome/browser/chromeos/wm_ipc.h" +#endif + namespace chromeos { class PanelTest : public InProcessBrowserTest { @@ -59,12 +62,15 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) { ASSERT_TRUE(new_browser); EXPECT_TRUE(new_browser->is_type_popup()); EXPECT_FALSE(new_browser->is_app()); + +#if defined(TOOLKIT_USES_GTK) // This window type tells the cros window manager to treat the window // as a panel. EXPECT_EQ( WM_IPC_WINDOW_CHROME_PANEL_CONTENT, WmIpc::instance()->GetWindowType( GTK_WIDGET(new_browser->window()->GetNativeHandle()), NULL)); +#endif } // Large popups should open as new tab. |