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

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 10985069: [test fixlet] Add tests for the zoom icon in the location bar on GTK. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add todo Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « build/filename_rules.gypi ('k') | chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/gtk/location_bar_view_gtk.h" 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 l10n_util::GetStringUTF8(tooltip_id).c_str()); 830 l10n_util::GetStringUTF8(tooltip_id).c_str());
831 } 831 }
832 832
833 g_signal_connect(result, "button-press-event", 833 g_signal_connect(result, "button-press-event",
834 G_CALLBACK(click_callback), this); 834 G_CALLBACK(click_callback), this);
835 835
836 return result; 836 return result;
837 } 837 }
838 838
839 void LocationBarViewGtk::CreateZoomButton() { 839 void LocationBarViewGtk::CreateZoomButton() {
840 // TODO(khorimoto): Add tests for zoom button.
841 zoom_.Own(CreateIconButton(&zoom_image_, 840 zoom_.Own(CreateIconButton(&zoom_image_,
842 0, 841 0,
843 VIEW_ID_NONE, 842 VIEW_ID_ZOOM_BUTTON,
844 0, 843 0,
845 OnZoomButtonPressThunk)); 844 OnZoomButtonPressThunk));
846 } 845 }
847 846
848 void LocationBarViewGtk::CreateStarButton() { 847 void LocationBarViewGtk::CreateStarButton() {
849 star_.Own(CreateIconButton(&star_image_, 848 star_.Own(CreateIconButton(&star_image_,
850 0, 849 0,
851 VIEW_ID_STAR_BUTTON, 850 VIEW_ID_STAR_BUTTON,
852 IDS_TOOLTIP_STAR, 851 IDS_TOOLTIP_STAR,
853 OnStarButtonPressThunk)); 852 OnStarButtonPressThunk));
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2138 } 2137 }
2139 2138
2140 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 2139 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
2141 ExtensionAction* action) { 2140 ExtensionAction* action) {
2142 ExtensionPopupGtk::Show( 2141 ExtensionPopupGtk::Show(
2143 action->GetPopupUrl(current_tab_id_), 2142 action->GetPopupUrl(current_tab_id_),
2144 owner_->browser_, 2143 owner_->browser_,
2145 event_box_.get(), 2144 event_box_.get(),
2146 ExtensionPopupGtk::SHOW_AND_INSPECT); 2145 ExtensionPopupGtk::SHOW_AND_INSPECT);
2147 } 2146 }
OLDNEW
« no previous file with comments | « build/filename_rules.gypi ('k') | chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698