Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Side by Side Diff: chrome/browser/gtk/browser_toolbar_gtk.cc

Issue 67064: Implement tooltips for the Go/Stop button in Linux. (Closed)
Patch Set: Add a NULL check on location_bar_ for tests. Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/gtk/go_button_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/gtk/browser_toolbar_gtk.h" 5 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/base_paths_linux.h" 10 #include "base/base_paths_linux.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 if (*show_home_button_) 118 if (*show_home_button_)
119 home_.reset(MakeHomeButton()); 119 home_.reset(MakeHomeButton());
120 120
121 gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0); 121 gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
122 122
123 star_.reset(BuildStarButton(l10n_util::GetString(IDS_TOOLTIP_STAR))); 123 star_.reset(BuildStarButton(l10n_util::GetString(IDS_TOOLTIP_STAR)));
124 124
125 location_bar_->Init(); 125 location_bar_->Init();
126 gtk_box_pack_start(GTK_BOX(toolbar_), location_bar_->widget(), TRUE, TRUE, 0); 126 gtk_box_pack_start(GTK_BOX(toolbar_), location_bar_->widget(), TRUE, TRUE, 0);
127 127
128 go_.reset(new GoButtonGtk(browser_)); 128 go_.reset(new GoButtonGtk(location_bar_.get(), browser_));
129 gtk_box_pack_start(GTK_BOX(toolbar_), go_->widget(), FALSE, FALSE, 0); 129 gtk_box_pack_start(GTK_BOX(toolbar_), go_->widget(), FALSE, FALSE, 0);
130 130
131 gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0); 131 gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
132 132
133 BuildToolbarMenuButton(IDR_MENU_PAGE, 133 BuildToolbarMenuButton(IDR_MENU_PAGE,
134 l10n_util::GetString(IDS_PAGEMENU_TOOLTIP), 134 l10n_util::GetString(IDS_PAGEMENU_TOOLTIP),
135 &page_menu_button_); 135 &page_menu_button_);
136 page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_)); 136 page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_));
137 137
138 BuildToolbarMenuButton(IDR_MENU_CHROME, 138 BuildToolbarMenuButton(IDR_MENU_CHROME,
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER), 409 rb.LoadPixbuf(IDR_CONTENT_TOP_RIGHT_CORNER),
410 rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE), 410 rb.LoadPixbuf(IDR_CONTENT_LEFT_SIDE),
411 NULL, 411 NULL,
412 rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE), 412 rb.LoadPixbuf(IDR_CONTENT_RIGHT_SIDE),
413 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER), 413 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_LEFT_CORNER),
414 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER), 414 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_CENTER),
415 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER) 415 rb.LoadPixbuf(IDR_CONTENT_BOTTOM_RIGHT_CORNER)
416 }; 416 };
417 background_ninebox_.reset(new NineBox(images)); 417 background_ninebox_.reset(new NineBox(images));
418 } 418 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gtk/go_button_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698