Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 167 const blink::WebPluginParams& params, | 167 const blink::WebPluginParams& params, |
| 168 const ChromeViewHostMsg_GetPluginInfo_Output& output); | 168 const ChromeViewHostMsg_GetPluginInfo_Output& output); |
| 169 | 169 |
| 170 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) | 170 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) |
| 171 static bool IsExtensionOrSharedModuleWhitelisted( | 171 static bool IsExtensionOrSharedModuleWhitelisted( |
| 172 const GURL& url, const std::set<std::string>& whitelist); | 172 const GURL& url, const std::set<std::string>& whitelist); |
| 173 #endif | 173 #endif |
| 174 | 174 |
| 175 static bool WasWebRequestUsedBySomeExtensions(); | 175 static bool WasWebRequestUsedBySomeExtensions(); |
| 176 | 176 |
| 177 void RecordRappor( | |
| 178 const std::string& metric, const std::string& sample) override; | |
|
jam
2015/04/02 16:24:14
nit: this should match the order of the interface,
kojii
2015/04/03 06:50:53
Done -- to be precise, methods above are not in th
| |
| 179 | |
| 177 private: | 180 private: |
| 178 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); | 181 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); |
| 179 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, | 182 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, |
| 180 ShouldSuppressErrorPage); | 183 ShouldSuppressErrorPage); |
| 181 | 184 |
| 182 #if defined(ENABLE_EXTENSIONS) | 185 #if defined(ENABLE_EXTENSIONS) |
| 183 // Gets extension by the given origin, regardless of whether the extension | 186 // Gets extension by the given origin, regardless of whether the extension |
| 184 // is active in the current process. | 187 // is active in the current process. |
| 185 const extensions::Extension* GetExtensionByOrigin( | 188 const extensions::Extension* GetExtensionByOrigin( |
| 186 const blink::WebSecurityOrigin& origin) const; | 189 const blink::WebSecurityOrigin& origin) const; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 236 #if defined(ENABLE_PRINT_PREVIEW) | 239 #if defined(ENABLE_PRINT_PREVIEW) |
| 237 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; | 240 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; |
| 238 #endif | 241 #endif |
| 239 #if defined(ENABLE_PLUGINS) | 242 #if defined(ENABLE_PLUGINS) |
| 240 std::set<std::string> allowed_camera_device_origins_; | 243 std::set<std::string> allowed_camera_device_origins_; |
| 241 std::set<std::string> allowed_compositor_origins_; | 244 std::set<std::string> allowed_compositor_origins_; |
| 242 #endif | 245 #endif |
| 243 }; | 246 }; |
| 244 | 247 |
| 245 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ | 248 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ |
| OLD | NEW |