From 6c8909c917c7e8fc735416adf5e6db82b0f91982 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Fri, 2 Jul 2010 07:31:11 +0000 Subject: Display content settings applying to the current otr session only. Also allow for editing them... The XIB change adds a column at the end of the table with a NSCheckboxCell in it and the title IDS_EXCEPTIONS_OTR_HEADER BUG=44480 TEST=manual Review URL: http://codereview.chromium.org/2858032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51507 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/profile.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'chrome/browser/profile.cc') diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index a2ddb0b..e9b76d9 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -346,6 +346,10 @@ class OffTheRecordProfileImpl : public Profile, NOTREACHED(); } + virtual bool HasOffTheRecordProfile() { + return true; + } + virtual Profile* GetOriginalProfile() { return profile_; } @@ -1024,6 +1028,10 @@ void ProfileImpl::DestroyOffTheRecordProfile() { off_the_record_profile_.reset(); } +bool ProfileImpl::HasOffTheRecordProfile() { + return off_the_record_profile_.get() != NULL; +} + Profile* ProfileImpl::GetOriginalProfile() { return this; } -- cgit v1.1