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

Side by Side Diff: chrome/browser/views/frame/browser_view.cc

Issue 4010004: Changed new tab content for Guest Session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: merge Created 10 years, 1 month 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
« no previous file with comments | « chrome/browser/resources/shared/images/guest_icon_standalone.png ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/views/frame/browser_view.h" 5 #include "chrome/browser/views/frame/browser_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 594
595 bool BrowserView::UseVerticalTabs() const { 595 bool BrowserView::UseVerticalTabs() const {
596 return browser_->tabstrip_model()->delegate()->UseVerticalTabs(); 596 return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
597 } 597 }
598 598
599 bool BrowserView::IsOffTheRecord() const { 599 bool BrowserView::IsOffTheRecord() const {
600 return browser_->profile()->IsOffTheRecord(); 600 return browser_->profile()->IsOffTheRecord();
601 } 601 }
602 602
603 bool BrowserView::ShouldShowOffTheRecordAvatar() const { 603 bool BrowserView::ShouldShowOffTheRecordAvatar() const {
604 return IsOffTheRecord() && IsBrowserTypeNormal(); 604 bool should_show_off_the_record_avatar =
605 IsOffTheRecord() && IsBrowserTypeNormal();
606 #if defined(OS_CHROMEOS)
607 should_show_off_the_record_avatar = should_show_off_the_record_avatar &&
608 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
609 #endif
610 return should_show_off_the_record_avatar;
605 } 611 }
606 612
607 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { 613 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
608 std::map<views::Accelerator, int>::const_iterator iter = 614 std::map<views::Accelerator, int>::const_iterator iter =
609 accelerator_table_.find(accelerator); 615 accelerator_table_.find(accelerator);
610 DCHECK(iter != accelerator_table_.end()); 616 DCHECK(iter != accelerator_table_.end());
611 617
612 int command_id = iter->second; 618 int command_id = iter->second;
613 if (browser_->command_updater()->SupportsCommand(command_id) && 619 if (browser_->command_updater()->SupportsCommand(command_id) &&
614 browser_->command_updater()->IsCommandEnabled(command_id)) { 620 browser_->command_updater()->IsCommandEnabled(command_id)) {
(...skipping 1853 matching lines...) Expand 10 before | Expand all | Expand 10 after
2468 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); 2474 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
2469 2475
2470 return view; 2476 return view;
2471 } 2477 }
2472 #endif 2478 #endif
2473 2479
2474 // static 2480 // static
2475 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2481 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2476 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2482 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2477 } 2483 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/shared/images/guest_icon_standalone.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698