Bring up a content settings icon for ungestured registerProtocolHandler call.
commit7ae9c325255a74c90c81b3f829da815ab210346e
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 17 Jul 2012 23:46:44 +0000 (17 23:46 +0000)
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Tue, 17 Jul 2012 23:46:44 +0000 (17 23:46 +0000)
tree42cef1c350335778bf71e39dddded7eaef90cb53
parent9e6c9bde9a6014b1cb703d064acfb5c07462f272
Bring up a content settings icon for ungestured registerProtocolHandler call.

Reverted by shess@chromium.org, turned out not to be related to the problem.
Revert CL: https://chromiumcodereview.appspot.com/10782038/
Original CL: https://chromiumcodereview.appspot.com/10584042

R=benwells@chromium.org
BUG=122020
TEST=None
TBR=gbillock@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147135 0039d316-1c4b-4281-b951-d872f2087c98
23 files changed:
chrome/app/nibs/ContentProtocolHandlers.xib [new file with mode: 0644]
chrome/browser/content_settings/content_settings_default_provider.cc
chrome/browser/content_settings/content_settings_policy_provider.cc
chrome/browser/content_settings/content_settings_utils.cc
chrome/browser/content_settings/tab_specific_content_settings.cc
chrome/browser/content_settings/tab_specific_content_settings.h
chrome/browser/ui/browser.cc
chrome/browser/ui/browser.h
chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc
chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
chrome/browser/ui/content_settings/content_setting_bubble_model.cc
chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
chrome/browser/ui/content_settings/content_setting_image_model.cc
chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
chrome/browser/ui/gtk/gtk_theme_service.cc
chrome/browser/ui/libgtk2ui/gtk2_ui.cc
chrome/browser/ui/views/external_tab_container_win.cc
chrome/browser/ui/webui/options2/content_settings_handler.cc
chrome/chrome_browser.gypi
chrome/chrome_dll.gypi
chrome/common/content_settings_types.h
chrome/test/base/testing_profile.cc
chrome/test/base/testing_profile.h