move chromeos bubble setup code to window.cc

chrome/browser/chromeos/frame/browser_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
 #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"
 #endif
 
 namespace {
 
 // Amount to tweak the position of the status area to get it to look right.
 const int kStatusAreaVerticalAdjustment = -1;
 
@@ skipping 252 matching lines @@
       has_hide_status_area_property_(false),
       should_show_layout_mode_button_(false) {
   system_menu_delegate_.reset(new SimpleMenuModelDelegateAdapter(this));
   BrowserList::AddObserver(this);
   MessageLoopForUI::current()->AddObserver(this);
 
 #if defined(TOOLKIT_USES_GTK)
   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
 }
 
 BrowserView::~BrowserView() {
   if (toolbar())
     toolbar()->RemoveMenuListener(this);
   MessageLoopForUI::current()->RemoveObserver(this);
   BrowserList::RemoveObserver(this);
 }
@@ skipping 292 matching lines @@
   menu->AppendSeparator();
   menu->AppendMenuItemWithLabel(IDC_TASK_MANAGER,
                                 l10n_util::GetStringUTF16(IDS_TASK_MANAGER));
 }
 
 void BrowserView::FetchHideStatusAreaProperty() {
 #if defined(TOOLKIT_USES_GTK)
   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;
     }
   }
 #endif
   has_hide_status_area_property_ = false;
 }
 
 void BrowserView::UpdateLayoutModeButtonVisibility() {
   int count = 0;
@@ skipping 16 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create a browser view for chromeos.
   BrowserView* view;
   if (browser->is_type_popup() || browser->is_type_panel())
     view = new chromeos::PanelBrowserView(browser);
   else
     view = new chromeos::BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }