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

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: jam review changes 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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 private: 368 private:
369 class ResourceContext : public content::ResourceContext { 369 class ResourceContext : public content::ResourceContext {
370 public: 370 public:
371 explicit ResourceContext(ProfileIOData* io_data); 371 explicit ResourceContext(ProfileIOData* io_data);
372 virtual ~ResourceContext(); 372 virtual ~ResourceContext();
373 373
374 // ResourceContext implementation: 374 // ResourceContext implementation:
375 virtual net::HostResolver* GetHostResolver() OVERRIDE; 375 virtual net::HostResolver* GetHostResolver() OVERRIDE;
376 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 376 virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
377 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; 377 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE;
378 virtual void CreateKeygenHandler(
379 uint32 key_size_in_bits,
380 const std::string& challenge_string,
381 const GURL& url,
382 const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback)
383 OVERRIDE;
378 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE; 384 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE;
379 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE; 385 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE;
380 virtual std::string GetMediaDeviceIDSalt() OVERRIDE; 386 virtual std::string GetMediaDeviceIDSalt() OVERRIDE;
381 387
382 private: 388 private:
383 friend class ProfileIOData; 389 friend class ProfileIOData;
384 390
385 // Helper method that returns true if |type| is allowed for |origin|, false 391 // Helper method that returns true if |type| is allowed for |origin|, false
386 // otherwise. 392 // otherwise.
387 bool AllowContentAccess(const GURL& origin, ContentSettingsType type); 393 bool AllowContentAccess(const GURL& origin, ContentSettingsType type);
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 560
555 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 561 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
556 bool initialized_on_UI_thread_; 562 bool initialized_on_UI_thread_;
557 563
558 bool is_incognito_; 564 bool is_incognito_;
559 565
560 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 566 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
561 }; 567 };
562 568
563 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 569 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698