1 files changed, 199 insertions, 77 deletions

diff --git a/chrome/browser/chromeos/browser_extender.cc b/chrome/browser/chromeos/browser_extender.cc
index 250713b..2d12293 100644
--- a/chrome/browser/chromeos/browser_extender.cc
+++ b/chrome/browser/chromeos/browser_extender.cc
@@ -10,101 +10,223 @@
 #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 "chrome/browser/views/panel_controller.h"
+#include "chrome/browser/views/tabs/tab_overview_types.h"
+#include "chrome/browser/views/toolbar_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/controls/button/button.h"
 #include "views/controls/button/image_button.h"
+#include "views/controls/menu/simple_menu_model.h"
 #include "views/window/window.h"
 
-BrowserExtender::BrowserExtender(BrowserView* browser_view)
-    : browser_view_(browser_view),
-      main_menu_(new views::ImageButton(this)) {
-}
+namespace {
+
+// NormalExtender adds ChromeOS specific controls and menus to BrowserView
+// created with Browser::TYPE_NORMAL. For Browser::TYPE_POPUP type of
+// BrowserView, see PopupExtender class below.
+class NormalExtender : public BrowserExtender,
+                       public views::ButtonListener,
+                       public views::ContextMenuController {
+ public:
+  explicit NormalExtender(BrowserView* browser_view)
+      : BrowserExtender(browser_view),
+        main_menu_(NULL) {
+  }
+  virtual ~NormalExtender() {}
+
+ protected:
+  // BrowserExtender overrides.
+  virtual void Init() {
+    main_menu_ = new views::ImageButton(this);
+    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()->GetWindow()->GetNativeWindow());
+    browser_view()->AddChildView(status_area_);
+    status_area_->Init();
+
+    // TODO(oshima): set the context menu controller to NonClientFrameView.
+    InitSystemMenu();
+    MainMenu::ScheduleCreation();
+  }
 
-////////////////////////////////////////////////////////////////////////////////
-// BrowserExtender, public:
+  virtual gfx::Rect Layout(const gfx::Rect& bounds) {
+    // skip if there is no space to layout.
+    if (bounds.IsEmpty())
+      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());
+  }
 
-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_->GetWindow()->GetNativeWindow());
-  browser_view_->AddChildView(status_area_);
-  status_area_->Init();
-
-  // TODO(oshima): set the context menu controller to NonClientFrameView.
-  InitSystemMenu();
-}
+  virtual bool 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::Rect BrowserExtender::Layout(const gfx::Rect& bounds) {
-  if (bounds.IsEmpty()) {
-    // skip if there is no space to layout.
-    return bounds;
+    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);
   }
-  // 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);
+  virtual void Show() {
+    // TODO(oshima): PanelController seems to be doing something similar.
+    // Investigate if we need both.
+    TabOverviewTypes::instance()->SetWindowType(
+        GTK_WIDGET(GetBrowserWindow()->GetNativeWindow()),
+        TabOverviewTypes::WINDOW_TYPE_CHROME_TOPLEVEL,
+        NULL);
+  }
 
-  gfx::Point point_in_status_area_coords(point);
-  views::View::ConvertPointToView(browser_view_->GetParent(), status_area_,
-                                  &point_in_status_area_coords);
+ private:
+  // Creates system menu.
+  void 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()));
+  }
 
-  return main_menu_->HitTest(point_in_main_menu_coords) ||
-      status_area_->HitTest(point_in_status_area_coords);
-}
+  // views::ButtonListener overrides.
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
+    MainMenu::Show(browser_view()->browser());
+  }
 
-////////////////////////////////////////////////////////////////////////////////
-// 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()));
-}
+  // views::ContextMenuController overrides.
+  virtual void ShowContextMenu(views::View* source,
+                               int x,
+                               int y,
+                               bool is_mouse_gesture) {
+    system_menu_menu_->RunMenuAt(gfx::Point(x, y), views::Menu2::ALIGN_TOPLEFT);
+  }
+
+  // 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(NormalExtender);
+};
+
+// PopupExtender class creates dedicated title window for popup window.
+// The size and location of the created title window is controlled by
+// by window manager.
+class PopupExtender : public BrowserExtender {
+ public:
+  explicit PopupExtender(BrowserView* browser_view)
+      : BrowserExtender(browser_view) {
+  }
+  virtual ~PopupExtender() {}
+
+ private:
+  // BrowserExtender overrides.
+  virtual void Init() {
+    // The visibility of toolbar is controlled in
+    // the BrowserView::IsToolbarVisible method.
+
+    views::Window* window = GetBrowserWindow();
+    gfx::NativeWindow native_window = window->GetNativeWindow();
+    // The window manager needs the min size for popups.
+    gfx::Rect bounds = window->GetBounds();
+    gtk_widget_set_size_request(
+        GTK_WIDGET(native_window), bounds.width(), bounds.height());
+    // If we don't explicitly resize here there is a race condition between
+    // the X Server and the window manager. Windows will appear with a default
+    // size of 200x200 if this happens.
+    gtk_window_resize(native_window, bounds.width(), bounds.height());
+  }
+
+  virtual bool NonClientHitTest(const gfx::Point& point) {
+    return false;
+  }
+
+  virtual void Show() {
+    panel_controller_.reset(new PanelController(browser_view()));
+  }
+
+  virtual void Close() {
+    if (panel_controller_.get())
+      panel_controller_->Close();
+  }
+
+  virtual void UpdateTitleBar() {
+    if (panel_controller_.get())
+      panel_controller_->UpdateTitleBar();
+  }
+
+  virtual void ActivationChanged() {
+    if (panel_controller_.get()) {
+      if (GetBrowserWindow()->IsActive())
+        panel_controller_->OnFocusIn();
+      else
+        panel_controller_->OnFocusOut();
+    }
+  }
+
+  // Controls interactions with the window manager for popup panels.
+  scoped_ptr<PanelController> panel_controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(PopupExtender);
+};
+
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
-// BrowserExtender, views::ButtonListener implemenation:
+// BrowserExtender, public:
 
-void BrowserExtender::ButtonPressed(views::Button* sender,
-                                    const views::Event& event) {
-  MainMenu::Show(browser_view_->browser());
+BrowserExtender::BrowserExtender(BrowserView* browser_view)
+    : browser_view_(browser_view),
+      can_close_(true) {
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// 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);
+// static
+BrowserExtender* BrowserExtender::Create(BrowserView* browser_view) {
+  BrowserExtender* extender;
+  if (browser_view->browser()->type() & Browser::TYPE_POPUP)
+    extender = new PopupExtender(browser_view);
+  else
+    extender = new NormalExtender(browser_view);
+  extender->Init();
+  return extender;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// BrowserExtender, protected:
+
+views::Window* BrowserExtender::GetBrowserWindow() {
+  return browser_view_->frame()->GetWindow();
+}