Compact Navigation bar must be hidden in FullScreen mode.

chrome/browser/gtk/browser_window_gtk.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 "chrome/browser/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include <string>
@@ skipping 522 matching lines @@
 #endif
 
 BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
     :  browser_(browser),
        state_(GDK_WINDOW_STATE_WITHDRAWN),
 #if defined(OS_CHROMEOS)
        drag_active_(false),
        panel_controller_(NULL),
        compact_navigation_bar_(NULL),
        status_area_(NULL),
+       main_menu_button_(NULL),
+       compact_navbar_hbox_(NULL),
 #endif
        frame_cursor_(NULL),
        is_active_(true),
        last_click_time_(0),
        maximize_after_show_(false),
        accel_group_(NULL) {
   use_custom_frame_pref_.Init(prefs::kUseCustomChromeFrame,
       browser_->profile()->GetPrefs(), this);
 
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
@@ skipping 853 matching lines @@
 
   if (changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
     bool is_fullscreen = state & GDK_WINDOW_STATE_FULLSCREEN;
     browser_->UpdateCommandsForFullscreenMode(is_fullscreen);
     if (is_fullscreen) {
       UpdateCustomFrame();
       toolbar_->Hide();
       tabstrip_->Hide();
       if (IsBookmarkBarSupported())
         bookmark_bar_->EnterFullscreen();
+#if defined(OS_CHROMEOS)
+      if (main_menu_button_)
+        gtk_widget_hide(main_menu_button_->widget());
+      if (compact_navbar_hbox_)
+        gtk_widget_hide(compact_navbar_hbox_);
+      if (status_area_)
+        status_area_->GetWidget()->Hide();
+#endif
     } else {
       UpdateCustomFrame();
       ShowSupportedWindowFeatures();
     }
   }
 
   UpdateWindowShape(bounds_.width(), bounds_.height());
   SaveWindowPosition();
 }
 
@@ skipping 178 matching lines @@
   gtk_container_add(GTK_CONTAINER(window_container_), window_vbox_);
 
   tabstrip_.reset(new TabStripGtk(browser_->tabstrip_model(), this));
   tabstrip_->Init();
 
   // Build the titlebar (tabstrip + header space + min/max/close buttons).
   titlebar_.reset(new BrowserTitlebar(this, window_));
 
 #if defined(OS_CHROMEOS)
   GtkWidget* titlebar_hbox = NULL;
-  GtkWidget* navbar_hbox = NULL;
   GtkWidget* status_container = NULL;
   bool has_compact_nav_bar = next_window_should_use_compact_nav_;
   if (browser_->type() == Browser::TYPE_NORMAL) {
     // Make a box that we'll later insert the compact navigation bar into. The
     // tabstrip must go into an hbox with our box so that they can get arranged
     // horizontally.
     titlebar_hbox = gtk_hbox_new(FALSE, 0);
     gtk_widget_show(titlebar_hbox);
 
     // Main menu button.
-    CustomDrawButton* main_menu_button =
+    main_menu_button_ =
         new CustomDrawButton(IDR_MAIN_MENU_BUTTON, IDR_MAIN_MENU_BUTTON,
                              IDR_MAIN_MENU_BUTTON, 0);
-    gtk_widget_show(main_menu_button->widget());
-    g_signal_connect(G_OBJECT(main_menu_button->widget()), "clicked",
+    gtk_widget_show(main_menu_button_->widget());
+    g_signal_connect(G_OBJECT(main_menu_button_->widget()), "clicked",
                      G_CALLBACK(OnMainMenuButtonClicked), this);
-    GTK_WIDGET_UNSET_FLAGS(main_menu_button->widget(), GTK_CAN_FOCUS);
-    gtk_box_pack_start(GTK_BOX(titlebar_hbox), main_menu_button->widget(),
+    GTK_WIDGET_UNSET_FLAGS(main_menu_button_->widget(), GTK_CAN_FOCUS);
+    gtk_box_pack_start(GTK_BOX(titlebar_hbox), main_menu_button_->widget(),
                        FALSE, FALSE, 0);
 
     MainMenu::ScheduleCreation();
 
     if (has_compact_nav_bar) {
-      navbar_hbox = gtk_hbox_new(FALSE, 0);
-      gtk_widget_show(navbar_hbox);
-      gtk_box_pack_start(GTK_BOX(titlebar_hbox), navbar_hbox, FALSE, FALSE, 0);
+      compact_navbar_hbox_ = gtk_hbox_new(FALSE, 0);
+      gtk_widget_show(compact_navbar_hbox_);
+      gtk_box_pack_start(GTK_BOX(titlebar_hbox), compact_navbar_hbox_,
+                         FALSE, FALSE, 0);
 
       // Reset the compact nav bit now that we're creating the next toplevel
       // window. Code below will use our local has_compact_nav_bar variable.
       next_window_should_use_compact_nav_ = false;
     }
     status_container = gtk_fixed_new();
     gtk_widget_show(status_container);
     gtk_box_pack_start(GTK_BOX(titlebar_hbox), titlebar_->widget(), TRUE, TRUE,
                        0);
     gtk_box_pack_start(GTK_BOX(titlebar_hbox), status_container, FALSE, FALSE,
@@ skipping 103 matching lines @@
       // Create the compact navigation bar. This must be done after adding
       // everything to the window since it's done in Views, which expects to
       // call realize (requiring a window) in the Init function.
       views::WidgetGtk* clb_widget =
           new views::WidgetGtk(views::WidgetGtk::TYPE_CHILD);
       clb_widget->set_delete_on_destroy(true);
       // Must initialize with a NULL parent since the widget will assume the
       // parent is also a WidgetGtk. Then we can parent the native widget
       // afterwards.
       clb_widget->Init(NULL, gfx::Rect(0, 0, 100, 30));
-      gtk_widget_reparent(clb_widget->GetNativeView(), navbar_hbox);
+      gtk_widget_reparent(clb_widget->GetNativeView(), compact_navbar_hbox_);
 
       compact_navigation_bar_ = new CompactNavigationBar(browser_.get());
 
       clb_widget->SetContentsView(compact_navigation_bar_);
       compact_navigation_bar_->Init();
 
       // Must be after Init.
       gtk_widget_set_size_request(clb_widget->GetNativeView(),
           compact_navigation_bar_->GetPreferredSize().width(), 20);
       clb_widget->Show();
@@ skipping 362 matching lines @@
 
 void BrowserWindowGtk::ShowSupportedWindowFeatures() {
   if (IsTabStripSupported())
     tabstrip_->Show();
 
   if (IsToolbarSupported())
     toolbar_->Show();
 
   if (IsBookmarkBarSupported())
     MaybeShowBookmarkBar(browser_->GetSelectedTabContents(), false);
+
+#if defined(OS_CHROMEOS)
+  if (main_menu_button_)
+    gtk_widget_show(main_menu_button_->widget());
+
+  if (compact_navbar_hbox_)
+    gtk_widget_show(compact_navbar_hbox_);
+
+  if (status_area_)
+    status_area_->GetWidget()->Show();
+#endif
 }
 
 void BrowserWindowGtk::HideUnsupportedWindowFeatures() {
   if (!IsTabStripSupported())
     tabstrip_->Hide();
 
   if (!IsToolbarSupported())
     toolbar_->Hide();
 
   // If the bookmark bar shelf is unsupported, then we never create it.
@@ skipping 120 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }