Implements a zoom icon in the Omnibox for Views.

chrome/browser/ui/gtk/zoom_bubble_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/zoom_bubble_gtk.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 // Number of milliseconds the bubble should stay open for if it will auto-close.
 const int kBubbleCloseDelay = 400;
 
 // Need to manually set anchor width and height to ensure that the bubble shows
 // in the correct spot the first time it is displayed when no icon is present.
 const int kBubbleAnchorWidth = 20;
 const int kBubbleAnchorHeight = 25;
 }
 
 // static
-void ZoomBubbleGtk::Show(GtkWidget* anchor,
-                         Profile* profile,
-                         int zoom_percent,
-                         bool autoclose) {
+void ZoomBubbleGtk::Show(GtkWidget* anchor, Profile* profile,
+    int zoomPercent, bool autoclose) {

[Ben Goodger (Google), 2012/06/04 15:16:49]

leave

[Kyle Horimoto, 2012/06/05 05:03:59]

This was changed in my other CL and must have gotten tracked here because I
rebased off of that CL. Someone told me to change this in the other CL so I'll
just leave it as-is.

   if (g_bubble)
     ZoomBubbleGtk::Close();
-  g_bubble = new ZoomBubbleGtk(anchor, profile, zoom_percent, autoclose);
+  g_bubble = new ZoomBubbleGtk(anchor, profile, zoomPercent, autoclose);

[Ben Goodger (Google), 2012/06/04 15:16:49]

leave this parameter name the way it was

[Kyle Horimoto, 2012/06/05 05:03:59]

Same.

 }
 
 // static
 void ZoomBubbleGtk::Close() {
   if (g_bubble)
     g_bubble->CloseBubble();
 }
 
 void ZoomBubbleGtk::BubbleClosing(BubbleGtk* bubble, bool closed_by_escape) {
 }
 
 void ZoomBubbleGtk::Observe(int type,
                             const content::NotificationSource& source,
                             const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
 
   if (theme_service_->UsingNativeTheme())
     gtk_widget_modify_fg(label_, GTK_STATE_NORMAL, NULL);
   else
     gtk_widget_modify_fg(label_, GTK_STATE_NORMAL, &ui::kGdkBlack);
 }
 
 ZoomBubbleGtk::ZoomBubbleGtk(GtkWidget* anchor,
                              Profile* profile,
-                             int zoom_percent,
+                             int zoomPercent,
                              bool autoclose)
     : theme_service_(GtkThemeService::GetFrom(profile)),
       factory_(this) {
   string16 labelText = l10n_util::GetStringFUTF16Int(
-      IDS_ZOOM_PERCENT, zoom_percent);
+      IDS_ZOOM_PERCENT, zoomPercent);
   label_ = gtk_label_new(UTF16ToUTF8(labelText).c_str());
 
   GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0,
                             kContentBorder, kContentBorder);
   gtk_container_add(GTK_CONTAINER(alignment), label_);
 
   GtkWidget* content = gtk_event_box_new();
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(content), TRUE);
   gtk_container_add(GTK_CONTAINER(content), alignment);
@@ skipping 39 matching lines @@
 }
 
 void ZoomBubbleGtk::CloseBubble() {
   bubble_->Close();
 }
 
 void ZoomBubbleGtk::OnDestroy(GtkWidget* widget) {
   // Listen to the destroy signal and delete this instance when it is caught.
   delete this;
 }