Display action box menu on Linux/gtk.

chrome/browser/ui/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 541 matching lines @@
     // This offset corrects the strange offset of CustomDrawButton.
     const int kMagicActionBoxYOffset = 3;
     GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
                               0, kMagicActionBoxYOffset,
                               0, kInnerPadding);
     gtk_container_add(GTK_CONTAINER(alignment), action_box_button_->widget());
 
     gtk_box_pack_end(GTK_BOX(hbox_.get()), alignment,
                      FALSE, FALSE, 0);
-  } else if (browser_defaults::bookmarks_enabled && !ShouldOnlyShowLocation()) {
+  }
+
+  if (browser_defaults::bookmarks_enabled && !ShouldOnlyShowLocation()) {
     // Hide the star and Chrome To Mobile icons in popups, app windows, etc.
     CreateStarButton();
     gtk_box_pack_end(GTK_BOX(hbox_.get()), star_.get(), FALSE, FALSE, 0);
 
     // Disable Chrome To Mobile for off-the-record and non-synced profiles,
     // or if the feature is disabled by a command line flag or chrome://flags.
     if (!profile->IsOffTheRecord() && profile->IsSyncAccessible() &&
         ChromeToMobileService::IsChromeToMobileEnabled()) {
       CreateChromeToMobileButton();
       gtk_box_pack_end(GTK_BOX(hbox_.get()), chrome_to_mobile_view_.get(),
@@ skipping 989 matching lines @@
 
   gtk_widget_show(zoom_.get());
 }
 
 void LocationBarViewGtk::UpdateStarIcon() {
   if (!star_.get())
     return;
   bool star_enabled = !toolbar_model_->input_in_progress() &&
                       edit_bookmarks_enabled_.GetValue();
   command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
-  if (star_enabled) {
+
+  bool visible = star_enabled;

[msw, 2012/08/30 03:39:22]

nit: mutate |star_enabled| (after UpdateCommandEnabled) and nix |visible|.

[beaudoin, 2012/08/30 20:55:05]

Done.

+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox) &&
+      !starred_)
+    visible = false;
+  if (visible) {
+    int id = starred_ ? IDR_STAR_LIT : IDR_STAR;
+    gtk_image_set_from_pixbuf(GTK_IMAGE(star_image_),
+                              theme_service_->GetImageNamed(id)->ToGdkPixbuf());
     gtk_widget_show_all(star_.get());

[msw, 2012/08/30 03:39:22]

nit: any reason to re-order this after the two preceding statements?

[beaudoin, 2012/08/30 20:55:05]

Probably left-over from my experimentations. :)

Done.

-    int id = starred_ ? IDR_STAR_LIT : IDR_STAR;
-    gtk_image_set_from_pixbuf(
-        GTK_IMAGE(star_image_),
-        theme_service_->GetImageNamed(id)->ToGdkPixbuf());
   } else {
     gtk_widget_hide_all(star_.get());
   }
 }
 
 void LocationBarViewGtk::UpdateChromeToMobileIcon() {
   if (!chrome_to_mobile_view_.get())
     return;
 
   Profile* profile = browser_->profile();
@@ skipping 546 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }