diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 00:08:15 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 00:08:15 +0000 |
| commit | 85ff70b6c85d318bb2326ef317237542a709436f (patch) | |
| tree | 7d9b1acb190f599190cbd7256e82365b5a62487c /chrome | |
| parent | 138241facf9c08e9a4b65f5848d99741af863034 (diff) | |
| download | chromium_src-85ff70b6c85d318bb2326ef317237542a709436f.zip chromium_src-85ff70b6c85d318bb2326ef317237542a709436f.tar.gz chromium_src-85ff70b6c85d318bb2326ef317237542a709436f.tar.bz2 | |
Fix bad conflict resolution for r43146.
TBR=arv
TEST=local compile
BUG=none
Review URL: http://codereview.chromium.org/1586006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index d140c62..80119fa 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -139,8 +139,8 @@ const GdkColor LocationBarViewGtk::kBackgroundColor = LocationBarViewGtk::LocationBarViewGtk( const BubblePositioner* bubble_positioner, Browser* browser) - : starred_(false), - star_image_(NULL), + : star_image_(NULL), + starred_(false), security_icon_event_box_(NULL), ev_secure_icon_image_(NULL), secure_icon_image_(NULL), @@ -316,21 +316,14 @@ void LocationBarViewGtk::Init(bool popup_window_mode) { g_signal_connect(location_icon_event_box_, "button-press-event", G_CALLBACK(&OnIconPressed), this); -<<<<<<< .mine CreateStarButton(); gtk_box_pack_end(GTK_BOX(hbox_.get()), star_.get(), FALSE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(security_icon_event_box_), security_icon_box); - gtk_widget_set_name(security_icon_event_box_, - "chrome-security-icon-eventbox"); - gtk_box_pack_end(GTK_BOX(hbox_.get()), security_icon_event_box_, -======= gtk_container_add(GTK_CONTAINER(location_icon_event_box_), location_icon_image_); gtk_widget_set_name(location_icon_event_box_, "chrome-location-icon-eventbox"); gtk_box_pack_end(GTK_BOX(hbox_.get()), location_icon_event_box_, ->>>>>>> .r43144 FALSE, FALSE, 0); content_setting_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding)); |