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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 251653003: Introduces DevToolsManagerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix CloudPrintProxyPolicyStartupTest failure Created 6 years, 7 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 unified diff | Download patch
OLDNEW
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_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 271 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
272 bool* success) OVERRIDE; 272 bool* success) OVERRIDE;
273 #endif 273 #endif
274 274
275 virtual bool IsPluginAllowedToCallRequestOSFileHandle( 275 virtual bool IsPluginAllowedToCallRequestOSFileHandle(
276 content::BrowserContext* browser_context, 276 content::BrowserContext* browser_context,
277 const GURL& url) OVERRIDE; 277 const GURL& url) OVERRIDE;
278 278
279 virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE; 279 virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE;
280 280
281 virtual content::DevToolsManagerDelegate* GetDevToolsManagerDelegate()
282 OVERRIDE;
jam 2014/05/12 15:01:23 nit: don't start a line with OVERRIDE
horo 2014/05/12 16:21:48 Done.
283
281 private: 284 private:
282 #if defined(ENABLE_WEBRTC) 285 #if defined(ENABLE_WEBRTC)
283 // Copies disable WebRTC encryption switch depending on the channel. 286 // Copies disable WebRTC encryption switch depending on the channel.
284 static void MaybeCopyDisableWebRtcEncryptionSwitch( 287 static void MaybeCopyDisableWebRtcEncryptionSwitch(
285 base::CommandLine* to_command_line, 288 base::CommandLine* to_command_line,
286 const base::CommandLine& from_command_line, 289 const base::CommandLine& from_command_line,
287 VersionInfo::Channel channel); 290 VersionInfo::Channel channel);
288 #endif 291 #endif
289 292
290 #if defined(ENABLE_PLUGINS) 293 #if defined(ENABLE_PLUGINS)
291 // Set of origins that can use TCP/UDP private APIs from NaCl. 294 // Set of origins that can use TCP/UDP private APIs from NaCl.
292 std::set<std::string> allowed_socket_origins_; 295 std::set<std::string> allowed_socket_origins_;
293 // Set of origins that can get a handle for FileIO from NaCl. 296 // Set of origins that can get a handle for FileIO from NaCl.
294 std::set<std::string> allowed_file_handle_origins_; 297 std::set<std::string> allowed_file_handle_origins_;
295 #endif 298 #endif
296 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate> 299 scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
297 permissions_policy_delegate_; 300 permissions_policy_delegate_;
298 301
299 friend class DisableWebRtcEncryptionFlagTest; 302 friend class DisableWebRtcEncryptionFlagTest;
300 303
301 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 304 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
302 }; 305 };
303 306
304 } // namespace chrome 307 } // namespace chrome
305 308
306 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 309 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698