CompactNavigationBar for toolkit views build, with some design change per Cole's request.

chrome/browser/chromeos/chromeos_browser_extenders.cc

 // 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 <algorithm>
 
 #include "app/theme_provider.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/chromeos/main_menu.h"
 #include "chrome/browser/chromeos/status_area_view.h"
 #include "chrome/browser/chromeos/panel_controller.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_frame_gtk.h"
 #include "chrome/browser/views/frame/browser_view.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"
@@ skipping 28 matching lines @@
   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_);
 
+    compact_navigation_bar_ =
+        new CompactNavigationBar(browser_view()->browser());
+    browser_view()->AddChildView(compact_navigation_bar_);
+    compact_navigation_bar_->Init();
+    // Disabled by default.
+    // TODO(oshima): Get this info from preference.
+    compact_navigation_bar_->SetVisible(false);
+
     status_area_ = new StatusAreaView(
         browser_view()->browser(),
         browser_view()->GetWindow()->GetNativeWindow());
     browser_view()->AddChildView(status_area_);
     status_area_->Init();
 
     InitSystemMenu();
     MainMenu::ScheduleCreation();
 
     // The ContextMenuController has to be set to a NonClientView but
@@ skipping 13 matching lines @@
     // 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 curx = bounds.x() + main_menu_size.width();
     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());
+
+    if (compact_navigation_bar_->IsVisible()) {
+      gfx::Size cnb_bounds = compact_navigation_bar_->GetPreferredSize();
+      compact_navigation_bar_->SetBounds(curx, bounds.y(),
+                                         cnb_bounds.width(), bounds.height());
+      curx += cnb_bounds.width();
+      width -= cnb_bounds.width();
+    }
+    width = std::max(0, width);  // In case there is no space left.
+    return gfx::Rect(curx, bounds.y(), width, bounds.height());
   }
 
   virtual bool NonClientHitTest(const gfx::Point& point) {
     gfx::Point point_in_main_menu_coords(point);
     views::View::ConvertPointToView(browser_view(), main_menu_,
                                     &point_in_main_menu_coords);
+    if (main_menu_->HitTest(point_in_main_menu_coords))
+      return true;
 
     gfx::Point point_in_status_area_coords(point);
     views::View::ConvertPointToView(browser_view(), status_area_,
                                     &point_in_status_area_coords);
+    if (status_area_->HitTest(point_in_status_area_coords))
+      return true;
 
-    return main_menu_->HitTest(point_in_main_menu_coords) ||
-        status_area_->HitTest(point_in_status_area_coords);
+    if (compact_navigation_bar_->IsVisible()) {
+      gfx::Point point_in_cnb_coords(point);
+      views::View::ConvertPointToView(browser_view(),
+                                      compact_navigation_bar_,
+                                      &point_in_cnb_coords);
+      return compact_navigation_bar_->HitTest(point_in_cnb_coords);
+    }
+    return false;
   }
 
+  virtual void UpdateTitleBar() {}
+
   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);
   }
 
+  virtual void Close() {}
+
+  virtual void ActivationChanged() {}
+
+  virtual bool ShouldForceHideToolbar() {
+    return compact_navigation_bar_->IsVisible();
+  }
+
+  virtual void ToggleCompactNavigationBar() {
+    compact_navigation_bar_->SetVisible(!compact_navigation_bar_->IsVisible());
+  }
+
  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);
@@ skipping 16 matching lines @@
   // 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_;
 
+  // CompactNavigationBar view.
+  CompactNavigationBar* compact_navigation_bar_;
+
   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) {
@@ skipping 11 matching lines @@
     // 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 gfx::Rect Layout(const gfx::Rect& bounds) {
+    return bounds;
+  }
+
   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();
     }
   }
 
+  virtual bool ShouldForceHideToolbar() {
+    // Always hide toolbar for popups.
+    return true;
+  }
+
+  virtual void ToggleCompactNavigationBar() {}
+
   // Controls interactions with the window manager for popup panels.
   scoped_ptr<PanelController> panel_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupExtender);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserExtender, public:
 
 // 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;
 }