summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 02:06:45 +0000
committergroby@chromium.org <groby@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 02:06:45 +0000
commit6097cb525fabf26d254f79f400ac5362a8b094e9 (patch)
tree4e997800c6bd9be4545bfa7cb9dd049dce868d75
parent51c3781cd4e4a0040d1fff6927c993f3b96f487b (diff)
downloadchromium_src-6097cb525fabf26d254f79f400ac5362a8b094e9.zip
chromium_src-6097cb525fabf26d254f79f400ac5362a8b094e9.tar.gz
chromium_src-6097cb525fabf26d254f79f400ac5362a8b094e9.tar.bz2
Added flags to disable zoom icon by default.
TBR=estade BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10635009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143513 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/gtk/location_bar_view_gtk.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index e789462..80e8c61 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -324,8 +324,11 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
CreateStarButton();
gtk_box_pack_end(GTK_BOX(hbox_.get()), star_.get(), FALSE, FALSE, 0);
- CreateZoomButton();
- gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0);
+ // Zoom code is commented out for now because it is not complete for all
+ // platforms, so it should not be present in M21.
+ // TODO(khorimoto): Uncomment the code below once it is ready.
+ // CreateZoomButton();
+ // gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0);
// Also 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.