Revert 64246 (reviewer's veto) - Use special text for Guest Session instead o...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 583 matching lines @@
 
 bool BrowserView::UseVerticalTabs() const {
   return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
 }
 
 bool BrowserView::IsOffTheRecord() const {
   return browser_->profile()->IsOffTheRecord();
 }
 
 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) {
   std::map<views::Accelerator, int>::const_iterator iter =
       accelerator_table_.find(accelerator);
   DCHECK(iter != accelerator_table_.end());
 
   int command_id = iter->second;
   if (browser_->command_updater()->SupportsCommand(command_id) &&
       browser_->command_updater()->IsCommandEnabled(command_id)) {
@@ skipping 1853 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }