Index: chrome/browser/chromeos/frame/browser_view.cc |
diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc |
index 30ddc8e8e0068ea9623fc18ab369d79a400329ec..f67e5d6ded7ab33b815ff93825c6094f3c5a9e0a 100644 |
--- a/chrome/browser/chromeos/frame/browser_view.cc |
+++ b/chrome/browser/chromeos/frame/browser_view.cc |
@@ -45,6 +45,7 @@ |
#include "views/controls/menu/menu_runner.h" |
#include "views/widget/root_view.h" |
#include "views/widget/widget.h" |
+#include "views/widget/wm_ipc.h" |
#if defined(TOOLKIT_USES_GTK) |
#include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" |
@@ -317,7 +318,8 @@ BrowserView::BrowserView(Browser* browser) |
if (!g_chrome_state_gdk_atom) |
g_chrome_state_gdk_atom = |
gdk_atom_intern( |
- WmIpc::instance()->GetAtomName(WmIpc::ATOM_CHROME_STATE).c_str(), |
+ WmIpc::instance()->GetAtomName( |
+ views::chromeos::WmIpc::ATOM_CHROME_STATE).c_str(), |
FALSE); // !only_if_exists |
#endif |
} |
@@ -630,7 +632,8 @@ void BrowserView::FetchHideStatusAreaProperty() { |
std::set<WmIpc::AtomType> state_atoms; |
if (WmIpc::instance()->GetWindowState( |
GTK_WIDGET(frame()->GetNativeWindow()), &state_atoms)) { |
- if (state_atoms.count(WmIpc::ATOM_CHROME_STATE_STATUS_HIDDEN)) { |
+ if (state_atoms.count( |
+ views::chromeos::WmIpc::ATOM_CHROME_STATE_STATUS_HIDDEN)) { |
has_hide_status_area_property_ = true; |
return; |
} |