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

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

Issue 1858633003: bluetooth: Populate Web Bluetooth blacklist from variations:: parameter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fixes Created 4 years, 8 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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 bool AllowWebRTCIdentityCache(const GURL& url, 165 bool AllowWebRTCIdentityCache(const GURL& url,
166 const GURL& first_party_url, 166 const GURL& first_party_url,
167 content::ResourceContext* context) override; 167 content::ResourceContext* context) override;
168 #endif // defined(ENABLE_WEBRTC) 168 #endif // defined(ENABLE_WEBRTC)
169 169
170 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override; 170 bool AllowKeygen(const GURL& url, content::ResourceContext* context) override;
171 AllowWebBluetoothResult AllowWebBluetooth( 171 AllowWebBluetoothResult AllowWebBluetooth(
172 content::BrowserContext* browser_context, 172 content::BrowserContext* browser_context,
173 const url::Origin& requesting_origin, 173 const url::Origin& requesting_origin,
174 const url::Origin& embedding_origin) override; 174 const url::Origin& embedding_origin) override;
175 std::string GetWebBluetoothBlacklist() override;
175 176
jam 2016/04/05 22:35:44 nit: there shouldn't be blank lines here and on li
scheib 2016/04/05 23:02:53 Done.
176 net::URLRequestContext* OverrideRequestContextForURL( 177 net::URLRequestContext* OverrideRequestContextForURL(
177 const GURL& url, 178 const GURL& url,
178 content::ResourceContext* context) override; 179 content::ResourceContext* context) override;
179 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 180 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
180 scoped_ptr<storage::QuotaEvictionPolicy> GetTemporaryStorageEvictionPolicy( 181 scoped_ptr<storage::QuotaEvictionPolicy> GetTemporaryStorageEvictionPolicy(
181 content::BrowserContext* context) override; 182 content::BrowserContext* context) override;
182 void AllowCertificateError( 183 void AllowCertificateError(
183 content::WebContents* web_contents, 184 content::WebContents* web_contents,
184 int cert_error, 185 int cert_error,
185 const net::SSLInfo& ssl_info, 186 const net::SSLInfo& ssl_info,
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 // Vector of additional ChromeContentBrowserClientParts. 349 // Vector of additional ChromeContentBrowserClientParts.
349 // Parts are deleted in the reverse order they are added. 350 // Parts are deleted in the reverse order they are added.
350 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 351 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
351 352
352 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 353 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
353 354
354 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 355 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
355 }; 356 };
356 357
357 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 358 #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') | content/public/browser/content_browser_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698