Implement location only display mode (used by popup windows).

chrome/browser/gtk/location_bar_view_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/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/page_transition_types.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
-// Top and bottom padding/margin
 // We are positioned with a little bit of extra space that we don't use now.
 const int kTopMargin = 1;
 const int kBottomMargin = 1;
+const int kLeftMargin = 1;
+const int kRightMargin = 1;
 // We draw a border on the top and bottom (but not on left or right).
 const int kBorderThickness = 1;
 
 // Left margin of first run bubble.
 const int kFirstRunBubbleLeftMargin = 8;
 // Extra vertical spacing for first run bubble.
 const int kFirstRunBubbleTopMargin = 1;
 // Task delay (in milliseconds) to show first run bubble.
 const int kFirstRunBubbleTaskDelay = 200;
 
@@ skipping 58 matching lines @@
       tab_to_search_hint_(NULL),
       tab_to_search_hint_leading_label_(NULL),
       tab_to_search_hint_icon_(NULL),
       tab_to_search_hint_trailing_label_(NULL),
       profile_(NULL),
       command_updater_(command_updater),
       toolbar_model_(toolbar_model),
       popup_positioner_(popup_positioner),
       disposition_(CURRENT_TAB),
       transition_(PageTransition::TYPED),
-      first_run_bubble_(this) {
+      first_run_bubble_(this),
+      popup_window_mode_(false) {
 }
 
 LocationBarViewGtk::~LocationBarViewGtk() {
   // All of our widgets should have be children of / owned by the alignment.
   hbox_.Destroy();
 }
 
-void LocationBarViewGtk::Init() {
+void LocationBarViewGtk::Init(bool popup_window_mode) {
+  popup_window_mode_ = popup_window_mode;
   location_entry_.reset(new AutocompleteEditViewGtk(this,
                                                     toolbar_model_,
                                                     profile_,
                                                     command_updater_,
+                                                    popup_window_mode_,
                                                     popup_positioner_));
   location_entry_->Init();
 
   hbox_.Own(gtk_hbox_new(FALSE, 0));
   // We will paint for the alignment, to paint the background and border.
   gtk_widget_set_app_paintable(hbox_.get(), TRUE);
   // Have GTK double buffer around the expose signal.
   gtk_widget_set_double_buffered(hbox_.get(), TRUE);
   // Redraw the whole location bar when it changes size (e.g., when toggling
   // the home button on/off.
@@ skipping 31 matching lines @@
             tab_to_search_label_, &kKeywordBackgroundColor, 1, 1, 2, 2),
         &kKeywordBorderColor, 1, 1, 1, 1));
 
   gtk_box_pack_start(GTK_BOX(hbox_.get()), tab_to_search_, FALSE, FALSE, 0);
 
   GtkWidget* align = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   // TODO(erg): Like in BrowserToolbarGtk, this used to have a code path on
   // construction for with GTK themes and without. Doing that only on
   // construction was wrong, and I can't see a difference between the two ways
   // anyway... Investigate more later.
-  gtk_alignment_set_padding(GTK_ALIGNMENT(align),
-                            kTopMargin + kBorderThickness,
-                            kBottomMargin + kBorderThickness,
-                            kEditLeftRightPadding, kEditLeftRightPadding);
+  if (popup_window_mode_) {
+    gtk_alignment_set_padding(GTK_ALIGNMENT(align),
+                              kTopMargin + kBorderThickness,
+                              kBottomMargin + kBorderThickness,
+                              kEditLeftRightPadding + kBorderThickness,
+                              kEditLeftRightPadding + kBorderThickness);
+  } else {
+    gtk_alignment_set_padding(GTK_ALIGNMENT(align),
+                              kTopMargin + kBorderThickness,
+                              kBottomMargin + kBorderThickness,
+                              kEditLeftRightPadding, kEditLeftRightPadding);
+  }
   gtk_container_add(GTK_CONTAINER(align), location_entry_->widget());
   gtk_box_pack_start(GTK_BOX(hbox_.get()), align, TRUE, TRUE, 0);
 
   // Tab to search notification (the hint on the right hand side).
   tab_to_search_hint_ = gtk_hbox_new(FALSE, 0);
   tab_to_search_hint_leading_label_ = gtk_label_new(NULL);
   tab_to_search_hint_icon_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
   tab_to_search_hint_trailing_label_ = gtk_label_new(NULL);
   gtk_box_pack_start(GTK_BOX(tab_to_search_hint_),
@@ skipping 189 matching lines @@
   GdkRectangle inner_rect = {
       alloc_rect->x,
       alloc_rect->y + kTopMargin,
       alloc_rect->width,
       alloc_rect->height - kTopMargin - kBottomMargin};
 
   // Some of our calculations are a bit sloppy.  Since we draw on our parent
   // window, set a clip to make sure that we don't draw outside.
   gdk_gc_set_clip_rectangle(gc, &inner_rect);
 
-  // If we're not using GTK theming, draw our own border.
+  // Draw the background.
+  gdk_gc_set_rgb_fg_color(gc,
+      &kBackgroundColorByLevel[toolbar_model_->GetSchemeSecurityLevel()]);
+  gdk_draw_rectangle(drawable, gc, TRUE,
+                     inner_rect.x,
+                     inner_rect.y,
+                     inner_rect.width,
+                     inner_rect.height);
+
+  // If we're not using GTK theming, draw our own border over the edge pixels
+  // of the background.
   if (!profile_ ||
       !GtkThemeProvider::GetFrom(profile_)->UseGtkTheme()) {
     // Draw our 1px border.  TODO(deanm): Maybe this would be cleaner as an
     // overdrawn stroked rect with a clip to the allocation?
     gdk_gc_set_rgb_fg_color(gc, &kBorderColor);
     gdk_draw_rectangle(drawable, gc, TRUE,
                        inner_rect.x,
                        inner_rect.y,
                        inner_rect.width,
                        kBorderThickness);
     gdk_draw_rectangle(drawable, gc, TRUE,
                        inner_rect.x,
                        inner_rect.y + inner_rect.height - kBorderThickness,
                        inner_rect.width,
                        kBorderThickness);
+    if (popup_window_mode_) {
+      gdk_draw_rectangle(drawable, gc, TRUE,
+                         inner_rect.x,
+                         inner_rect.y,
+                         kBorderThickness,
+                         inner_rect.height);
+      gdk_draw_rectangle(drawable, gc, TRUE,
+                         inner_rect.x + inner_rect.width - kBorderThickness,
+                         inner_rect.y,
+                         kBorderThickness,
+                         inner_rect.height);
+    }
   }
 
-  // Draw the background within the border.
-  gdk_gc_set_rgb_fg_color(gc,
-      &kBackgroundColorByLevel[toolbar_model_->GetSchemeSecurityLevel()]);
-  gdk_draw_rectangle(drawable, gc, TRUE,
-                     inner_rect.x,
-                     inner_rect.y + kBorderThickness,
-                     inner_rect.width,
-                     inner_rect.height - (kBorderThickness * 2));
-
   g_object_unref(gc);
 
   return FALSE;  // Continue propagating the expose.
 }
 
 void LocationBarViewGtk::SetSecurityIcon(ToolbarModel::Icon icon) {
   gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_));
   gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_));
   if (icon != ToolbarModel::NO_ICON)
     gtk_widget_show(GTK_WIDGET(security_icon_align_));
@@ skipping 88 matching lines @@
   // The bubble needs to be just below the Omnibox and slightly to the right
   // of star button, so shift x and y co-ordinates.
   x += widget()->allocation.x + kFirstRunBubbleLeftMargin;
   y += widget()->allocation.y + widget()->allocation.height +
        kFirstRunBubbleTopMargin;
 
   FirstRunBubble::Show(profile_,
       GTK_WINDOW(gtk_widget_get_toplevel(widget())),
       gfx::Rect(x, y, 0, 0), use_OEM_bubble);
 }