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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

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 #include "chrome/browser/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 486
487 #if defined(OS_CHROMEOS) 487 #if defined(OS_CHROMEOS)
488 // Special case of the OffTheRecordProfileImpl which is used while Guest 488 // Special case of the OffTheRecordProfileImpl which is used while Guest
489 // session in CrOS. 489 // session in CrOS.
490 class GuestSessionProfile : public OffTheRecordProfileImpl { 490 class GuestSessionProfile : public OffTheRecordProfileImpl {
491 public: 491 public:
492 explicit GuestSessionProfile(Profile* real_profile) 492 explicit GuestSessionProfile(Profile* real_profile)
493 : OffTheRecordProfileImpl(real_profile) { 493 : OffTheRecordProfileImpl(real_profile) {
494 } 494 }
495 495
496 virtual ProfileType GetProfileType() const OVERRIDE { 496 virtual ProfileType GetProfileType() const override {
497 return GUEST_PROFILE; 497 return GUEST_PROFILE;
498 } 498 }
499 499
500 virtual void InitChromeOSPreferences() OVERRIDE { 500 virtual void InitChromeOSPreferences() override {
501 chromeos_preferences_.reset(new chromeos::Preferences()); 501 chromeos_preferences_.reset(new chromeos::Preferences());
502 chromeos_preferences_->Init( 502 chromeos_preferences_->Init(
503 this, user_manager::UserManager::Get()->GetActiveUser()); 503 this, user_manager::UserManager::Get()->GetActiveUser());
504 } 504 }
505 505
506 private: 506 private:
507 // The guest user should be able to customize Chrome OS preferences. 507 // The guest user should be able to customize Chrome OS preferences.
508 scoped_ptr<chromeos::Preferences> chromeos_preferences_; 508 scoped_ptr<chromeos::Preferences> chromeos_preferences_;
509 }; 509 };
510 #endif 510 #endif
(...skipping 30 matching lines...) Expand all
541 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 541 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
542 #if defined(OS_CHROMEOS) 542 #if defined(OS_CHROMEOS)
543 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 543 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
544 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 544 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
545 g_browser_process->local_state()); 545 g_browser_process->local_state());
546 } 546 }
547 #endif // defined(OS_CHROMEOS) 547 #endif // defined(OS_CHROMEOS)
548 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 548 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
549 GetPrefs(), g_browser_process->local_state()); 549 GetPrefs(), g_browser_process->local_state());
550 } 550 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/off_the_record_profile_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698