Add ChromeOS controls to BrowserView

 * Added BrowserExtender class to isolate ChromeOS specific controls from BrowserView
 * Extender currently adds main menu and status area view only.
 * System menu is not enabled because using SetContextMenuController on NonClientFrameView
  didn't work. I need to investigate how.
 * PanelController support will be added in next CL.

Review URL: http://codereview.chromium.org/269078

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29021 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 192 insertions, 1 deletions

diff --git a/chrome/browser/chromeos/browser_extender.cc b/chrome/browser/chromeos/browser_extender.cc
new file mode 100644
index 0000000..f6041c0
--- /dev/null
+++ b/chrome/browser/chromeos/browser_extender.cc
@@ -0,0 +1,107 @@
+// Copyright (c) 2009 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/browser_extender.h"
+
+#include <algorithm>
+
+#include "app/theme_provider.h"
+#include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/chromeos/main_menu.h"
+#include "chrome/browser/chromeos/status_area_view.h"
+#include "chrome/browser/views/frame/browser_frame_gtk.h"
+#include "chrome/browser/views/frame/browser_view.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "views/controls/button/image_button.h"
+
+BrowserExtender::BrowserExtender(BrowserView* browser_view)
+    : browser_view_(browser_view),
+      main_menu_(new views::ImageButton(this)) {
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// BrowserExtender, public:
+
+void BrowserExtender::Init() {
+  ThemeProvider* theme_provider =
+      browser_view_->frame()->GetThemeProviderForFrame();
+  SkBitmap* image = theme_provider->GetBitmapNamed(IDR_MAIN_MENU_BUTTON);
+  main_menu_->SetImage(views::CustomButton::BS_NORMAL, image);
+  main_menu_->SetImage(views::CustomButton::BS_HOT, image);
+  main_menu_->SetImage(views::CustomButton::BS_PUSHED, image);
+  browser_view_->AddChildView(main_menu_);
+
+  status_area_ = new StatusAreaView(browser_view_->browser());
+  browser_view_->AddChildView(status_area_);
+  status_area_->Init();
+
+  // TODO(oshima): set the context menu controller to NonClientFrameView.
+  InitSystemMenu();
+}
+
+gfx::Rect BrowserExtender::Layout(const gfx::Rect& bounds) {
+  if (bounds.IsEmpty()) {
+    // skip if there is no space to layout.
+    return bounds;
+  }
+  // Layout main menu before tab strip.
+  gfx::Size main_menu_size = main_menu_->GetPreferredSize();
+  main_menu_->SetBounds(bounds.x(), bounds.y(),
+                        main_menu_size.width(), bounds.height());
+
+  // Layout status area after tab strip.
+  gfx::Size status_size = status_area_->GetPreferredSize();
+  status_area_->SetBounds(bounds.x() + bounds.width() - status_size.width(),
+                          bounds.y(), status_size.width(),
+                          status_size.height());
+  int width = bounds.width() - main_menu_size.width() - status_size.width();
+  return gfx::Rect(bounds.x() + main_menu_size.width(),
+                   bounds.y(),
+                   std::max(0, width),  // in case there is no space left.
+                   bounds.height());
+}
+
+bool BrowserExtender::NonClientHitTest(const gfx::Point& point) {
+  gfx::Point point_in_main_menu_coords(point);
+  views::View::ConvertPointToView(browser_view_->GetParent(), main_menu_,
+                                  &point_in_main_menu_coords);
+
+  gfx::Point point_in_status_area_coords(point);
+  views::View::ConvertPointToView(browser_view_->GetParent(), status_area_,
+                                  &point_in_status_area_coords);
+
+  return main_menu_->HitTest(point_in_main_menu_coords) ||
+      status_area_->HitTest(point_in_status_area_coords);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// BrowserExtender, private:
+
+void BrowserExtender::InitSystemMenu() {
+  system_menu_contents_.reset(new views::SimpleMenuModel(browser_view_));
+  system_menu_contents_->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
+  system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
+  system_menu_contents_->AddSeparator();
+  system_menu_contents_->AddItemWithStringId(IDC_TASK_MANAGER,
+                                             IDS_TASK_MANAGER);
+  system_menu_menu_.reset(new views::Menu2(system_menu_contents_.get()));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// BrowserExtender, views::ButtonListener implemenation:
+
+void BrowserExtender::ButtonPressed(views::Button* sender,
+                                    const views::Event& event) {
+  MainMenu::Show(browser_view_->browser());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// BrowserExtender, views::ContextMenuController implementation:
+
+void BrowserExtender::ShowContextMenu(views::View* source, int x, int y,
+                                      bool is_mouse_gesture) {
+  system_menu_menu_->RunMenuAt(gfx::Point(x, y), views::Menu2::ALIGN_TOPLEFT);
+}
+
diff --git a/chrome/browser/chromeos/browser_extender.h b/chrome/browser/chromeos/browser_extender.h
new file mode 100644
index 0000000..6150d5d
--- /dev/null
+++ b/chrome/browser/chromeos/browser_extender.h
@@ -0,0 +1,78 @@
+// Copyright (c) 2009 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_BROWSER_EXTENDER_H_
+#define CHROME_BROWSER_CHROMEOS_BROWSER_EXTENDER_H_
+
+#include "views/controls/button/button.h"
+#include "views/controls/menu/simple_menu_model.h"
+#include "views/controls/menu/view_menu_delegate.h"
+
+class BrowserView;
+class StatusAreaView;
+
+namespace views {
+class ImageButton;
+class SimpleMenuModel;
+}
+
+namespace gfx {
+class Point;
+}
+
+// BrowserExtender adds extra controls to BrowserView for ChromeOS.
+// This layout controls as follows
+//                  ____  __ __
+//      [MainMenu] /    \   \  \     [StatusArea]
+//
+// and adds the system context menu to the remaining arae of the titlebar.
+class BrowserExtender : public views::ButtonListener,
+                        public views::ContextMenuController {
+ public:
+  explicit BrowserExtender(BrowserView* browser_view);
+  virtual ~BrowserExtender() {}
+
+  // Initializes the extender. This creates controls, status area and
+  // menus.
+  void Init();
+
+  // Layouts controls within the given bounds and returns the remaining
+  // bounds for tabstip to be layed out.
+  gfx::Rect Layout(const gfx::Rect& bounds);
+
+  // Tests if the given |point|, which is given in window coordinates,
+  // hits any of controls.
+  bool NonClientHitTest(const gfx::Point& point);
+
+ private:
+  // Creates system menu.
+  void InitSystemMenu();
+
+  // Overridden from views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+
+  // views::ContextMenuController overrides:
+  virtual void ShowContextMenu(views::View* source,
+                               int x,
+                               int y,
+                               bool is_mouse_gesture);
+
+  // BrowserView to be extended.
+  BrowserView* browser_view_;  // weak
+
+  // Main menu button.
+  views::ImageButton* main_menu_;
+
+  // Status Area view.
+  StatusAreaView* status_area_;
+
+  // System menus
+  scoped_ptr<views::SimpleMenuModel> system_menu_contents_;
+  scoped_ptr<views::Menu2> system_menu_menu_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserExtender);
+};
+
+#endif  // CHROME_BROWSER_CHROMEOS_BROWSER_EXTENDER_H_
+
diff --git a/chrome/browser/chromeos/status_area_view.cc b/chrome/browser/chromeos/status_area_view.cc
index 2d25d62..d618d9b 100755
--- a/chrome/browser/chromeos/status_area_view.cc
+++ b/chrome/browser/chromeos/status_area_view.cc
@@ -16,7 +16,9 @@
 #include "chrome/browser/chromeos/clock_menu_button.h"
 #include "chrome/browser/chromeos/network_menu_button.h"
 #include "chrome/browser/chromeos/power_menu_button.h"
+#if !defined(TOOLKIT_VIEWS)
 #include "chrome/browser/gtk/browser_window_gtk.h"
+#endif
 #include "chrome/browser/profile.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -76,6 +78,10 @@ class OptionsMenuModel : public views::SimpleMenuModel,
   virtual void ExecuteCommand(int command_id) {
     switch (command_id) {
       case CREATE_NEW_WINDOW:
+#if defined(TOOLKIT_VIEWS)
+        // TODO(oshima): Implement accelerator to enable/disable
+        // compact nav bar.
+#else
         // Reach into the GTK browser window and enable the flag to create the
         // next window as a compact nav one.
         // TODO(brettw) this is an evil hack, and is here so this can be tested.
@@ -83,6 +89,7 @@ class OptionsMenuModel : public views::SimpleMenuModel,
         static_cast<BrowserWindowGtk*>(browser_->window())->
             set_next_window_should_use_compact_nav();
         browser_->ExecuteCommand(IDC_NEW_WINDOW);
+#endif
         break;
       case StatusAreaView::OPEN_TABS_ON_LEFT:
       case StatusAreaView::OPEN_TABS_CLOBBER:
@@ -263,4 +270,3 @@ void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
-