diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 18:17:42 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 18:17:42 +0000 |
| commit | 54cfd69da88df660a056ababe8f9ed8aff8d8e9b (patch) | |
| tree | 1eb452367fe3eaeb27cb53629a516cba37428583 /chrome/browser/chromeos/panels/panel_browsertest.cc | |
| parent | 121594b409d3d7459ae7a8068e2bae9b8b222d0f (diff) | |
| download | chromium_src-54cfd69da88df660a056ababe8f9ed8aff8d8e9b.zip chromium_src-54cfd69da88df660a056ababe8f9ed8aff8d8e9b.tar.gz chromium_src-54cfd69da88df660a056ababe8f9ed8aff8d8e9b.tar.bz2 | |
chromeos: Make Chrome use enums from libcros to talk to WM.
We currently have two copies of these enums, one in Chrome
and one in Chrome OS. I'm switching us to have a single
copy in the libcros repo.
This reverts r45955, which reverted r45952. I've added
third_party/cros to the browser directory's DEPS file to fix
the checkdeps.py failure.
http://codereview.chromium.org/1811002/show contains the
review of the original change.
BUG=none
TEST=built it and ran checkdeps.py manually
Review URL: http://codereview.chromium.org/1705017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/panels/panel_browsertest.cc')
| -rw-r--r-- | chrome/browser/chromeos/panels/panel_browsertest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index 4b01924..315860c 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "third_party/cros/chromeos_wm_ipc_enums.h" namespace chromeos { @@ -62,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(PanelTest, PanelOpenSmall) { // This window type tells the cros window manager to treat the window // as a panel. EXPECT_EQ( - WmIpc::WINDOW_TYPE_CHROME_PANEL_CONTENT, + WM_IPC_WINDOW_CHROME_PANEL_CONTENT, WmIpc::instance()->GetWindowType( GTK_WIDGET(new_browser->window()->GetNativeHandle()), NULL)); } |