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

Side by Side Diff: chrome/browser/content_settings/content_settings_internal_extension_provider.cc

Issue 24544004: Remove the chrome namespace around ChromeContent[Renderer]Client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/content_settings/content_settings_internal_extension_pr ovider.h" 5 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/content_settings/content_settings_rule.h" 8 #include "chrome/browser/content_settings/content_settings_rule.h"
9 #include "chrome/browser/extensions/extension_host.h" 9 #include "chrome/browser/extensions/extension_host.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 "C449A798C495E6CF7D6AF10162113D564E67AD12", 85 "C449A798C495E6CF7D6AF10162113D564E67AD12",
86 "E410CDAB2C6E6DD408D731016CECF2444000A912", 86 "E410CDAB2C6E6DD408D731016CECF2444000A912",
87 "EBA908206905323CECE6DC4B276A58A0F4AC573F" 87 "EBA908206905323CECE6DC4B276A58A0F4AC573F"
88 }; 88 };
89 if (extensions::SimpleFeature::IsIdInWhitelist( 89 if (extensions::SimpleFeature::IsIdInWhitelist(
90 host->extension()->id(), 90 host->extension()->id(),
91 std::set<std::string>( 91 std::set<std::string>(
92 kAppWhitelist, kAppWhitelist + arraysize(kAppWhitelist)))) { 92 kAppWhitelist, kAppWhitelist + arraysize(kAppWhitelist)))) {
93 SetContentSettingForExtensionAndResource( 93 SetContentSettingForExtensionAndResource(
94 host->extension(), 94 host->extension(),
95 chrome::ChromeContentClient::kRemotingViewerPluginPath, 95 ChromeContentClient::kRemotingViewerPluginPath,
96 CONTENT_SETTING_ALLOW); 96 CONTENT_SETTING_ALLOW);
97 } 97 }
98 } 98 }
99 99
100 break; 100 break;
101 } 101 }
102 case chrome::NOTIFICATION_EXTENSION_LOADED: { 102 case chrome::NOTIFICATION_EXTENSION_LOADED: {
103 const extensions::Extension* extension = 103 const extensions::Extension* extension =
104 content::Details<extensions::Extension>(details).ptr(); 104 content::Details<extensions::Extension>(details).ptr();
105 if (extensions::PluginInfo::HasPlugins(extension)) 105 if (extensions::PluginInfo::HasPlugins(extension))
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 Value::CreateIntegerValue(setting)); 158 Value::CreateIntegerValue(setting));
159 } 159 }
160 } 160 }
161 NotifyObservers(primary_pattern, 161 NotifyObservers(primary_pattern,
162 secondary_pattern, 162 secondary_pattern,
163 CONTENT_SETTINGS_TYPE_PLUGINS, 163 CONTENT_SETTINGS_TYPE_PLUGINS,
164 resource); 164 resource);
165 } 165 }
166 166
167 } // namespace content_settings 167 } // namespace content_settings
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/plugins/plugin_info_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698