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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 61643007: Update keygen to use correct NSS slot on ChromeOS multiprofile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to 238776 Created 7 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 | Annotate | Revision Log
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_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 private: 357 private:
358 class ResourceContext : public content::ResourceContext { 358 class ResourceContext : public content::ResourceContext {
359 public: 359 public:
360 explicit ResourceContext(ProfileIOData* io_data); 360 explicit ResourceContext(ProfileIOData* io_data);
361 virtual ~ResourceContext(); 361 virtual ~ResourceContext();
362 362
363 // ResourceContext implementation: 363 // ResourceContext implementation:
364 virtual net::HostResolver* GetHostResolver() OVERRIDE; 364 virtual net::HostResolver* GetHostResolver() OVERRIDE;
365 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 365 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
366 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; 366 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE;
367 virtual scoped_ptr<net::KeygenHandler> CreateKeygenHandler(
368 uint32 key_size_in_bits,
369 const std::string& challenge_string,
370 const GURL& url,
371 const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback)
372 OVERRIDE;
367 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE; 373 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
368 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE; 374 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
369 virtual std::string GetMediaDeviceIDSalt() OVERRIDE; 375 virtual std::string GetMediaDeviceIDSalt() OVERRIDE;
370 376
371 private: 377 private:
372 friend class ProfileIOData; 378 friend class ProfileIOData;
373 379
374 // Helper method that returns true if |type| is allowed for |origin|, false 380 // Helper method that returns true if |type| is allowed for |origin|, false
375 // otherwise. 381 // otherwise.
376 bool AllowContentAccess(const GURL& origin, ContentSettingsType type); 382 bool AllowContentAccess(const GURL& origin, ContentSettingsType type);
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 544
539 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 545 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
540 bool initialized_on_UI_thread_; 546 bool initialized_on_UI_thread_;
541 547
542 bool is_incognito_; 548 bool is_incognito_;
543 549
544 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 550 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
545 }; 551 };
546 552
547 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 553 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698