Separate StatusAreaView from StatusAreaViewChromeos

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>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chromeos/frame/layout_mode_button.h"
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
-#include "chrome/browser/chromeos/status/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/theme_background.h"
@@ skipping 105 matching lines @@
     status_area_ = NULL;
     layout_mode_button_ = NULL;
     ::BrowserViewLayout::Installed(host);
   }
 
   void ViewAdded(views::View* host,
                  views::View* view) {
     ::BrowserViewLayout::ViewAdded(host, view);
     switch (view->id()) {
       case VIEW_ID_STATUS_AREA:
-        status_area_ = static_cast<chromeos::StatusAreaView*>(view);
+        status_area_ = static_cast<chromeos::StatusAreaViewChromeos*>(view);
         break;
       case VIEW_ID_LAYOUT_MODE_BUTTON:
         layout_mode_button_ = static_cast<chromeos::LayoutModeButton*>(view);
         break;
     }
   }
 
   // In the normal and the compact navigation bar mode, ChromeOS
   // lays out compact navigation buttons and status views in the title
   // area. See Layout
@@ skipping 117 matching lines @@
     if (status_area_bounds_for_property_ != current_bounds) {
       status_area_bounds_for_property_ = current_bounds;
 #if defined(TOOLKIT_USES_GTK)
       WmIpc::instance()->SetStatusBoundsProperty(
           GTK_WIDGET(chromeos_browser_view()->frame()->GetNativeWindow()),
           status_area_bounds_for_property_);
 #endif
     }
   }
 
-  chromeos::StatusAreaView* status_area_;
+  chromeos::StatusAreaViewChromeos* status_area_;
   chromeos::LayoutModeButton* layout_mode_button_;
 
   // Most-recently-set bounds for the _CHROME_STATUS_BOUNDS property.
   // Empty if |status_area_| isn't visible.  Tracked here so we don't update the
   // property needlessly on no-op relayouts.
   gfx::Rect status_area_bounds_for_property_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewLayout);
 };
 
@@ skipping 23 matching lines @@
   if (toolbar())
     toolbar()->RemoveMenuListener(this);
   MessageLoopForUI::current()->RemoveObserver(this);
   BrowserList::RemoveObserver(this);
 }
 
 // BrowserView, ::BrowserView overrides:
 
 void BrowserView::Init() {
   ::BrowserView::Init();
-  status_area_ = new StatusAreaView(this);
+  status_area_ = new StatusAreaViewChromeos();
+  status_area_->Init(this, StatusAreaViewChromeos::BROWSER_MODE);
   status_area_->set_id(VIEW_ID_STATUS_AREA);
   AddChildView(status_area_);
-  status_area_->Init();
 
   layout_mode_button_ = new LayoutModeButton();
   layout_mode_button_->set_id(VIEW_ID_LAYOUT_MODE_BUTTON);
   AddChildView(layout_mode_button_);
   layout_mode_button_->Init();
 
   frame()->non_client_view()->set_context_menu_controller(this);
 
   // Listen to wrench menu opens.
   if (toolbar())
@@ skipping 148 matching lines @@
     Layout();
 }
 
 void BrowserView::OnBrowserRemoved(const Browser* browser) {
   const bool was_showing = should_show_layout_mode_button_;
   UpdateLayoutModeButtonVisibility();
   if (should_show_layout_mode_button_ != was_showing)
     Layout();
 }
 
-// BrowserView, StatusAreaHost implementation.
+// StatusAreaButton::Delegate overrides.
 
-Profile* BrowserView::GetProfile() const {
-  return browser()->profile();
-}
-
-gfx::NativeWindow BrowserView::GetNativeWindow() const {
-  return GetWidget()->GetNativeWindow();
-}
-
-bool BrowserView::ShouldOpenButtonOptions(
-    const views::View* button_view) const {
+bool BrowserView::ShouldExecuteStatusAreaCommand(
+    const views::View* button_view, int command_id) const {
   return true;
 }
 
-void BrowserView::ExecuteBrowserCommand(int id) const {
-  browser()->ExecuteCommand(id);
-}
-
-void BrowserView::OpenButtonOptions(const views::View* button_view) {
-  if (button_view == status_area_->network_view()) {
-    browser()->OpenInternetOptionsDialog();
-  } else if (button_view == status_area_->input_method_view()) {
-    browser()->OpenLanguageOptionsDialog();
-  } else {
-    browser()->OpenSystemOptionsDialog();
+void BrowserView::ExecuteStatusAreaCommand(
+    const views::View* button_view, int command_id) {
+  switch (command_id) {
+    case StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS:
+      browser()->OpenInternetOptionsDialog();
+      break;
+    case StatusAreaViewChromeos::SHOW_LANGUAGE_OPTIONS:
+      browser()->OpenLanguageOptionsDialog();
+      break;
+    case StatusAreaViewChromeos::SHOW_SYSTEM_OPTIONS:
+      browser()->OpenLanguageOptionsDialog();
+      break;
+    default:
+      NOTREACHED();
   }
 }
 
-StatusAreaHost::ScreenMode BrowserView::GetScreenMode() const {
-  return kBrowserMode;
+gfx::Font BrowserView::GetStatusAreaFont(const gfx::Font& font) const {
+  return font.DeriveFont(0, gfx::Font::BOLD);
 }
 
-StatusAreaHost::TextStyle BrowserView::GetTextStyle() const {
+StatusAreaButton::TextStyle BrowserView::GetStatusAreaTextStyle() const {
   ThemeService* theme_service =
-      ThemeServiceFactory::GetForProfile(GetProfile());
+      ThemeServiceFactory::GetForProfile(browser()->profile());
 
   if (!theme_service->UsingDefaultTheme())
-    return StatusAreaHost::kWhiteHaloed;
+    return StatusAreaButton::WHITE_HALOED;
 
   return IsOffTheRecord() ?
-      StatusAreaHost::kWhitePlain : StatusAreaHost::kGrayEmbossed;
+      StatusAreaButton::WHITE_PLAIN : StatusAreaButton::GRAY_EMBOSSED;
 }
 
 void BrowserView::ButtonVisibilityChanged(views::View* button_view) {
-  status_area_->ButtonVisibilityChanged(button_view);
+  status_area_->UpdateButtonVisibility();
 }
 
 // BrowserView, MessageLoopForUI::Observer implementation.
+
 #if defined(TOUCH_UI) || defined(USE_AURA)
 base::EventStatus BrowserView::WillProcessEvent(
     const base::NativeEvent& event) OVERRIDE {
   return base::EVENT_CONTINUE;
 }
 
 void BrowserView::DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
   // TODO(oshima): On Aura, WM should notify chrome someshow.
 }
 #else
@@ skipping 75 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;
 }