chrome/browser/ui/libgtk2ui/gtk2_ui.cc - Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Repair merge to head Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/content_settings/content_setting_bubble_model.cc ('K') | « chrome/browser/ui/gtk/gtk_theme_service.cc ('k') | chrome/browser/ui/views/external_tab_container_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

index e0d92a28a09acfae89fbb93fbed85fd73950f97e..c263b624e071eb0ec82328a941e5208d8ff02167 100644

--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

@@ -109,6 +109,7 @@ const int kAutocompleteImages[] = {

IDR_OMNIBOX_TTS_DARK,

IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON,

IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON,

+ IDR_REGISTER_PROTOCOL_HANDLER_LOCATIONBAR_ICON,

};

// This table converts button ids into a pair of gtk-stock id and state.

@@ -682,7 +683,8 @@ SkBitmap Gtk2UI::GenerateGtkThemeBitmap(int id) const {

case IDR_OMNIBOX_STAR:

case IDR_OMNIBOX_TTS:

case IDR_GEOLOCATION_ALLOWED_LOCATIONBAR_ICON:

- case IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON: {

+ case IDR_GEOLOCATION_DENIED_LOCATIONBAR_ICON:

+ case IDR_REGISTER_PROTOCOL_HANDLER_LOCATIONBAR_ICON: {

return GenerateTintedIcon(id, entry_tint_);

}

// In GTK mode, the dark versions of the omnibox icons only ever appear in