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

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

Issue 2488283003: bluetooth: web: Rename Blacklist to Blocklist (Closed)
Patch Set: rebase Created 4 years 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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 #if BUILDFLAG(ENABLE_WEBRTC) 163 #if BUILDFLAG(ENABLE_WEBRTC)
164 bool AllowWebRTCIdentityCache(const GURL& url, 164 bool AllowWebRTCIdentityCache(const GURL& url,
165 const GURL& first_party_url, 165 const GURL& first_party_url,
166 content::ResourceContext* context) override; 166 content::ResourceContext* context) override;
167 #endif // BUILDFLAG(ENABLE_WEBRTC) 167 #endif // BUILDFLAG(ENABLE_WEBRTC)
168 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override; 168 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override;
169 AllowWebBluetoothResult AllowWebBluetooth( 169 AllowWebBluetoothResult AllowWebBluetooth(
170 content::BrowserContext* browser_context, 170 content::BrowserContext* browser_context,
171 const url::Origin& requesting_origin, 171 const url::Origin& requesting_origin,
172 const url::Origin& embedding_origin) override; 172 const url::Origin& embedding_origin) override;
173 std::string GetWebBluetoothBlacklist() override; 173 std::string GetWebBluetoothBlocklist() override;
174 net::URLRequestContext* OverrideRequestContextForURL( 174 net::URLRequestContext* OverrideRequestContextForURL(
175 const GURL& url, 175 const GURL& url,
176 content::ResourceContext* context) override; 176 content::ResourceContext* context) override;
177 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 177 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
178 std::unique_ptr<storage::QuotaEvictionPolicy> 178 std::unique_ptr<storage::QuotaEvictionPolicy>
179 GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override; 179 GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override;
180 void AllowCertificateError( 180 void AllowCertificateError(
181 content::WebContents* web_contents, 181 content::WebContents* web_contents,
182 int cert_error, 182 int cert_error,
183 const net::SSLInfo& ssl_info, 183 const net::SSLInfo& ssl_info,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // Vector of additional ChromeContentBrowserClientParts. 365 // Vector of additional ChromeContentBrowserClientParts.
366 // Parts are deleted in the reverse order they are added. 366 // Parts are deleted in the reverse order they are added.
367 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 367 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
368 368
369 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 369 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
370 370
371 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 371 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
372 }; 372 };
373 373
374 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 374 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698