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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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_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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 488
489 void set_signin_names_for_testing(SigninNamesOnIOThread* signin_names); 489 void set_signin_names_for_testing(SigninNamesOnIOThread* signin_names);
490 490
491 private: 491 private:
492 class ResourceContext : public content::ResourceContext { 492 class ResourceContext : public content::ResourceContext {
493 public: 493 public:
494 explicit ResourceContext(ProfileIOData* io_data); 494 explicit ResourceContext(ProfileIOData* io_data);
495 virtual ~ResourceContext(); 495 virtual ~ResourceContext();
496 496
497 // ResourceContext implementation: 497 // ResourceContext implementation:
498 virtual net::HostResolver* GetHostResolver() OVERRIDE; 498 virtual net::HostResolver* GetHostResolver() override;
499 virtual net::URLRequestContext* GetRequestContext() OVERRIDE; 499 virtual net::URLRequestContext* GetRequestContext() override;
500 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() OVERRIDE; 500 virtual scoped_ptr<net::ClientCertStore> CreateClientCertStore() override;
501 virtual void CreateKeygenHandler( 501 virtual void CreateKeygenHandler(
502 uint32 key_size_in_bits, 502 uint32 key_size_in_bits,
503 const std::string& challenge_string, 503 const std::string& challenge_string,
504 const GURL& url, 504 const GURL& url,
505 const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback) 505 const base::Callback<void(scoped_ptr<net::KeygenHandler>)>& callback)
506 OVERRIDE; 506 override;
507 virtual SaltCallback GetMediaDeviceIDSalt() OVERRIDE; 507 virtual SaltCallback GetMediaDeviceIDSalt() override;
508 508
509 private: 509 private:
510 friend class ProfileIOData; 510 friend class ProfileIOData;
511 511
512 ProfileIOData* const io_data_; 512 ProfileIOData* const io_data_;
513 513
514 net::HostResolver* host_resolver_; 514 net::HostResolver* host_resolver_;
515 net::URLRequestContext* request_context_; 515 net::URLRequestContext* request_context_;
516 }; 516 };
517 517
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 709
710 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 710 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
711 bool initialized_on_UI_thread_; 711 bool initialized_on_UI_thread_;
712 712
713 const Profile::ProfileType profile_type_; 713 const Profile::ProfileType profile_type_;
714 714
715 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 715 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
716 }; 716 };
717 717
718 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 718 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_info_cache_unittest.h ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698