summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authoraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 07:37:57 +0000
committeraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-29 07:37:57 +0000
commit09f0cc93ef09136948d6c868f63d948094b92fa6 (patch)
tree658ea211024bae8b1569f6f973801e053135dd8b /chrome/browser/views
parentefe9e0d63dc93c9eed724ba5ce0c4c896bec6891 (diff)
downloadchromium_src-09f0cc93ef09136948d6c868f63d948094b92fa6.zip
chromium_src-09f0cc93ef09136948d6c868f63d948094b92fa6.tar.gz
chromium_src-09f0cc93ef09136948d6c868f63d948094b92fa6.tar.bz2
Revert 64246 (reviewer's veto) - Use special text for Guest Session instead of using standard text form Incognito mode.
BUG=chromium-os:6907 TEST=Enter Guest mode, open new tab. Check opened page. Review URL: http://codereview.chromium.org/4010004 TBR=altimofeev@chromium.org Review URL: http://codereview.chromium.org/4215005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64374 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_view.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index fb4be88..bc77707 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -601,13 +601,7 @@ bool BrowserView::IsOffTheRecord() const {
}
bool BrowserView::ShouldShowOffTheRecordAvatar() const {
- bool should_show_off_the_record_avatar =
- IsOffTheRecord() && IsBrowserTypeNormal();
-#if defined(OS_CHROMEOS)
- should_show_off_the_record_avatar = should_show_off_the_record_avatar &&
- !CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
-#endif
- return should_show_off_the_record_avatar;
+ return IsOffTheRecord() && IsBrowserTypeNormal();
}
bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {