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

Side by Side Diff: chrome/browser/extensions/chrome_extensions_browser_client.cc

Issue 590603002: Remove ExtensionAPIClient::IsWebViewRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed silly bug Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/extensions/chrome_extensions_browser_client.h" 5 #include "chrome/browser/extensions/chrome_extensions_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/version.h" 9 #include "base/version.h"
10 #include "chrome/browser/app_mode/app_mode_utils.h" 10 #include "chrome/browser/app_mode/app_mode_utils.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 || util::IsIncognitoEnabled(extension_id, context); 107 || util::IsIncognitoEnabled(extension_id, context);
108 } 108 }
109 109
110 bool ChromeExtensionsBrowserClient::CanExtensionCrossIncognito( 110 bool ChromeExtensionsBrowserClient::CanExtensionCrossIncognito(
111 const extensions::Extension* extension, 111 const extensions::Extension* extension,
112 content::BrowserContext* context) const { 112 content::BrowserContext* context) const {
113 return IsGuestSession(context) 113 return IsGuestSession(context)
114 || util::CanCrossIncognito(extension, context); 114 || util::CanCrossIncognito(extension, context);
115 } 115 }
116 116
117 bool ChromeExtensionsBrowserClient::IsWebViewRequest(
118 net::URLRequest* request) const {
119 return url_request_util::IsWebViewRequest(request);
120 }
121
122 net::URLRequestJob* 117 net::URLRequestJob*
123 ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob( 118 ChromeExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
124 net::URLRequest* request, 119 net::URLRequest* request,
125 net::NetworkDelegate* network_delegate, 120 net::NetworkDelegate* network_delegate,
126 const base::FilePath& directory_path, 121 const base::FilePath& directory_path,
127 const std::string& content_security_policy, 122 const std::string& content_security_policy,
128 bool send_cors_header) { 123 bool send_cors_header) {
129 return chrome_url_request_util::MaybeCreateURLRequestResourceBundleJob( 124 return chrome_url_request_util::MaybeCreateURLRequestResourceBundleJob(
130 request, 125 request,
131 network_delegate, 126 network_delegate,
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 } 261 }
267 262
268 scoped_ptr<extensions::RuntimeAPIDelegate> 263 scoped_ptr<extensions::RuntimeAPIDelegate>
269 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate( 264 ChromeExtensionsBrowserClient::CreateRuntimeAPIDelegate(
270 content::BrowserContext* context) const { 265 content::BrowserContext* context) const {
271 return scoped_ptr<extensions::RuntimeAPIDelegate>( 266 return scoped_ptr<extensions::RuntimeAPIDelegate>(
272 new ChromeRuntimeAPIDelegate(context)); 267 new ChromeRuntimeAPIDelegate(context));
273 } 268 }
274 269
275 } // namespace extensions 270 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | extensions/browser/extension_protocols.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698