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

Unified Diff: chrome/test/base/testing_profile.h

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits and rebase to ToT. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index 858f0f199544e5ae798cf3b441a7fb6ec9d97ef9..88b048eb00149a776446c0aedbe10752b7c1b2c3 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -210,6 +210,7 @@ class TestingProfile : public Profile {
void set_incognito(bool incognito) { incognito_ = incognito; }
// Assumes ownership.
virtual void SetOffTheRecordProfile(Profile* profile);
+ virtual void SetOriginalProfile(Profile* profile);
virtual Profile* GetOffTheRecordProfile() OVERRIDE;
virtual void DestroyOffTheRecordProfile() OVERRIDE {}
virtual bool HasOffTheRecordProfile() OVERRIDE;
@@ -340,6 +341,7 @@ class TestingProfile : public Profile {
bool incognito_;
scoped_ptr<Profile> incognito_profile_;
+ Profile* original_profile_;
// Did the last session exit cleanly? Default is true.
bool last_session_exited_cleanly_;
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698