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

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

Issue 7067040: Enable incognito_session_only preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with ToT Created 9 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 NotificationService::current()->Notify( 705 NotificationService::current()->Notify(
706 NotificationType::OTR_PROFILE_CREATED, 706 NotificationType::OTR_PROFILE_CREATED,
707 Source<Profile>(off_the_record_profile_.get()), 707 Source<Profile>(off_the_record_profile_.get()),
708 NotificationService::NoDetails()); 708 NotificationService::NoDetails());
709 } 709 }
710 return off_the_record_profile_.get(); 710 return off_the_record_profile_.get();
711 } 711 }
712 712
713 void ProfileImpl::DestroyOffTheRecordProfile() { 713 void ProfileImpl::DestroyOffTheRecordProfile() {
714 off_the_record_profile_.reset(); 714 off_the_record_profile_.reset();
715 extension_pref_value_map_->ClearAllIncognitoSessionOnlyPreferences();
715 } 716 }
716 717
717 bool ProfileImpl::HasOffTheRecordProfile() { 718 bool ProfileImpl::HasOffTheRecordProfile() {
718 return off_the_record_profile_.get() != NULL; 719 return off_the_record_profile_.get() != NULL;
719 } 720 }
720 721
721 Profile* ProfileImpl::GetOriginalProfile() { 722 Profile* ProfileImpl::GetOriginalProfile() {
722 return this; 723 return this;
723 } 724 }
724 725
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1646 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1647 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1647 return NULL; 1648 return NULL;
1648 if (!prerender_manager_.get()) { 1649 if (!prerender_manager_.get()) {
1649 CHECK(g_browser_process->prerender_tracker()); 1650 CHECK(g_browser_process->prerender_tracker());
1650 prerender_manager_.reset( 1651 prerender_manager_.reset(
1651 new prerender::PrerenderManager( 1652 new prerender::PrerenderManager(
1652 this, g_browser_process->prerender_tracker())); 1653 this, g_browser_process->prerender_tracker()));
1653 } 1654 }
1654 return prerender_manager_.get(); 1655 return prerender_manager_.get();
1655 } 1656 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs_unittest.cc ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698