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

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

Issue 2554253002: bluetooth: web: Rename Blacklist to Blocklist (Closed)
Patch Set: 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 #if defined(ENABLE_WEBRTC) 162 #if defined(ENABLE_WEBRTC)
163 bool AllowWebRTCIdentityCache(const GURL& url, 163 bool AllowWebRTCIdentityCache(const GURL& url,
164 const GURL& first_party_url, 164 const GURL& first_party_url,
165 content::ResourceContext* context) override; 165 content::ResourceContext* context) override;
166 #endif // defined(ENABLE_WEBRTC) 166 #endif // defined(ENABLE_WEBRTC)
167 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override; 167 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override;
168 AllowWebBluetoothResult AllowWebBluetooth( 168 AllowWebBluetoothResult AllowWebBluetooth(
169 content::BrowserContext* browser_context, 169 content::BrowserContext* browser_context,
170 const url::Origin& requesting_origin, 170 const url::Origin& requesting_origin,
171 const url::Origin& embedding_origin) override; 171 const url::Origin& embedding_origin) override;
172 std::string GetWebBluetoothBlacklist() override; 172 std::string GetWebBluetoothBlocklist() override;
173 net::URLRequestContext* OverrideRequestContextForURL( 173 net::URLRequestContext* OverrideRequestContextForURL(
174 const GURL& url, 174 const GURL& url,
175 content::ResourceContext* context) override; 175 content::ResourceContext* context) override;
176 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 176 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
177 std::unique_ptr<storage::QuotaEvictionPolicy> 177 std::unique_ptr<storage::QuotaEvictionPolicy>
178 GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override; 178 GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override;
179 void AllowCertificateError( 179 void AllowCertificateError(
180 content::WebContents* web_contents, 180 content::WebContents* web_contents,
181 int cert_error, 181 int cert_error,
182 const net::SSLInfo& ssl_info, 182 const net::SSLInfo& ssl_info,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 // Vector of additional ChromeContentBrowserClientParts. 364 // Vector of additional ChromeContentBrowserClientParts.
365 // Parts are deleted in the reverse order they are added. 365 // Parts are deleted in the reverse order they are added.
366 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 366 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
367 367
368 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 368 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
369 369
370 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 370 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
371 }; 371 };
372 372
373 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 373 #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