9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e - chromium/src.git

commit	9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e	[log] [tgz]
author	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Fri Jun 29 19:48:31 2012
committer	[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>	Fri Jun 29 19:48:31 2012
tree	c3de5935295407cfbdd92340b901f269d1f99362
parent	aeb8c4e81fb57be3175a034ba35298564791a0f1 [diff]

Revert 144957 - Bring up a content settings icon for ungestured registerProtocolHandler call.

[email protected]
BUG=122020
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10584042

[email protected]
Review URL: https://chromiumcodereview.appspot.com/10690051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144966 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/content_settings/content_settings_default_provider.cc[diff]
chrome/browser/content_settings/content_settings_utils.cc[diff]
chrome/browser/content_settings/tab_specific_content_settings.cc[diff]
chrome/browser/content_settings/tab_specific_content_settings.h[diff]
chrome/browser/ui/browser.cc[diff]
chrome/browser/ui/browser.h[diff]
chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc[diff]
chrome/browser/ui/content_settings/content_setting_bubble_model.cc[diff]
chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc[diff]
chrome/browser/ui/content_settings/content_setting_image_model.cc[diff]
chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc[diff]
chrome/browser/ui/gtk/gtk_theme_service.cc[diff]
chrome/browser/ui/libgtk2ui/gtk2_ui.cc[diff]
chrome/browser/ui/views/external_tab_container_win.cc[diff]
chrome/browser/ui/webui/options2/content_settings_handler2.cc[diff]
chrome/common/content_settings_types.h[diff]
chrome/test/base/testing_profile.cc[diff]
chrome/test/base/testing_profile.h[diff]

18 files changed

tree: c3de5935295407cfbdd92340b901f269d1f99362