Fullscreen for ChromeOS

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"
@@ skipping 21 matching lines @@
 //
 // and adds the system context menu to the remaining arae of the titlebar.
 //
 // 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) {
+        main_menu_(NULL),
+        status_area_(NULL),
+        compact_navigation_bar_(NULL),
+        // CompactNavigationBar is disabled by default.
+        // TODO(oshima): Get this info from preference.
+        compact_navigation_bar_enabled_(false) {
   }
   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_);
 
     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
     // not to a NonClientFrameView because a TabStrip is not a child of
     // a NonClientFrameView even though visually a TabStrip is over a
     // NonClientFrameView.
     BrowserFrameGtk* gtk_frame =
         static_cast<BrowserFrameGtk*>(browser_view()->frame());
     gtk_frame->GetNonClientView()->SetContextMenuController(this);
   }
 
   virtual gfx::Rect Layout(const gfx::Rect& bounds) {
-    // skip if there is no space to layout.
-    if (bounds.IsEmpty())
+    // Skip if there is no space to layout, or if the browser is in
+    // fullscreen mode.
+    if (bounds.IsEmpty() || browser_view()->IsFullscreen()) {
+      main_menu_->SetVisible(false);
+      compact_navigation_bar_->SetVisible(false);
+      status_area_->SetVisible(false);
       return bounds;
+    } else {
+      main_menu_->SetVisible(true);
+      compact_navigation_bar_->SetVisible(compact_navigation_bar_enabled_);
+      status_area_->SetVisible(true);
+    }
 
     // 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(),
@@ skipping 42 matching lines @@
         GTK_WIDGET(GetBrowserWindow()->GetNativeWindow()),
         TabOverviewTypes::WINDOW_TYPE_CHROME_TOPLEVEL,
         NULL);
   }
 
   virtual void Close() {}
 
   virtual void ActivationChanged() {}
 
   virtual bool ShouldForceHideToolbar() {
-    return compact_navigation_bar_->IsVisible();
+    return compact_navigation_bar_enabled_;
   }
 
   virtual void ToggleCompactNavigationBar() {
-    compact_navigation_bar_->SetVisible(!compact_navigation_bar_->IsVisible());
+    compact_navigation_bar_enabled_ = !compact_navigation_bar_enabled_;
   }
 
  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();
@@ skipping 21 matching lines @@
   // 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_;
 
+  // A toggle flag to show/hide the compact navigation bar.
+  bool compact_navigation_bar_enabled_;
+
   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 70 matching lines @@
 // 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;
 }