Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/frame/browser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "views/context_menu_controller.h"
 #include "views/controls/menu/menu_listener.h"
 
 class AccessibleToolbarView;
 class Profile;
+class StatusAreaButton;
 class TabStripModel;
 
 namespace ui {
 class SimpleMenuModel;
 }  // namespace ui
 
 namespace views {
 class ImageButton;
 class ImageView;
 class MenuDelegate;
 class MenuItemView;
 class MenuRunner;
 }  // namespace views
 
 namespace chromeos {
 
 class LayoutModeButton;
-class StatusAreaView;
-class StatusAreaButton;
+class StatusAreaViewChromeos;
 
 // chromeos::BrowserView adds ChromeOS specific controls and menus to a
 // BrowserView created with Browser::TYPE_TABBED. This extender adds controls
 // to the title bar as follows:
 //       ____  __ __
 //      /    \   \  \     [StatusArea] [LayoutModeButton]
 //
 // and adds the system context menu to the remaining area of the titlebar.
 class BrowserView : public ::BrowserView,
                     public views::ContextMenuController,
                     public views::MenuListener,
                     public BrowserList::Observer,
-                    public StatusAreaHost,
+                    public StatusAreaButton::Delegate,
                     public MessageLoopForUI::Observer {
  public:
   explicit BrowserView(Browser* browser);
   virtual ~BrowserView();
 
   // BrowserView implementation.
   virtual void Init() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ShowInactive() OVERRIDE;
   virtual void FocusChromeOSStatus() OVERRIDE;
@@ skipping 13 matching lines @@
                                       const gfx::Point& p,
                                       bool is_mouse_gesture) OVERRIDE;
 
   // views::MenuListener implementation.
   virtual void OnMenuOpened() OVERRIDE;
 
   // BrowserList::Observer implementation.
   virtual void OnBrowserAdded(const Browser* browser) OVERRIDE;
   virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE;
 
-  // StatusAreaHost overrides.
-  virtual Profile* GetProfile() const OVERRIDE;
-  virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
-  virtual bool ShouldOpenButtonOptions(
-      const views::View* button_view) const OVERRIDE;
-  virtual void ExecuteBrowserCommand(int id) const OVERRIDE;
-  virtual void OpenButtonOptions(const views::View* button_view) OVERRIDE;
-  virtual ScreenMode GetScreenMode() const OVERRIDE;
-  virtual TextStyle GetTextStyle() const OVERRIDE;
+  // StatusAreaButton::Delegate overrides.
+  virtual bool ShouldExecuteStatusAreaCommand(
+      const views::View* button_view, int command_id) const OVERRIDE;
+  virtual void ExecuteStatusAreaCommand(
+      const views::View* button_view, int command_id) OVERRIDE;
+  virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const OVERRIDE;
+  virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
   virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
 
   // MessageLoopForUI::Observer overrides.
 #if defined(TOUCH_UI) || defined(USE_AURA)
   // MessageLoopForUI::Observer overrides.
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE;
   virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
 #else
   virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {}
@@ skipping 24 matching lines @@
 
   void ShowInternal(bool is_active);
 
   // Updates |has_hide_status_area_property_| by querying the X server.
   void FetchHideStatusAreaProperty();
 
   // Updates |should_show_layout_mode_button_|.  Changes won't be visible
   // onscreen until Layout() is called.
   void UpdateLayoutModeButtonVisibility();
 
-  StatusAreaView* status_area_;
+  StatusAreaViewChromeos* status_area_;
   LayoutModeButton* layout_mode_button_;
 
   // System menu.
   scoped_ptr<views::MenuRunner> system_menu_runner_;
   scoped_ptr<views::MenuDelegate> system_menu_delegate_;
 
   // Focused native widget before wrench menu shows up. We need this to properly
   // perform cut, copy and paste. See http://crosbug.com/8496
   gfx::NativeView saved_focused_widget_;
 
   // Is the _CHROME_STATE_STATUS_HIDDEN atom present in our toplevel window's
   // _CHROME_STATE X property?  This gets set by window manager to tell us to
   // hide the status area.
   bool has_hide_status_area_property_;
 
   // Should the layout mode button be shown?  We only show it if there are
   // multiple browsers open.
   bool should_show_layout_mode_button_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FRAME_BROWSER_VIEW_H_