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

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

Issue 4186009: Changed new tab content for Guest Session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser
Patch Set: fix the link 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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 591
592 bool BrowserView::UseVerticalTabs() const { 592 bool BrowserView::UseVerticalTabs() const {
593 return browser_->tabstrip_model()->delegate()->UseVerticalTabs(); 593 return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
594 } 594 }
595 595
596 bool BrowserView::IsOffTheRecord() const { 596 bool BrowserView::IsOffTheRecord() const {
597 return browser_->profile()->IsOffTheRecord(); 597 return browser_->profile()->IsOffTheRecord();
598 } 598 }
599 599
600 bool BrowserView::ShouldShowOffTheRecordAvatar() const { 600 bool BrowserView::ShouldShowOffTheRecordAvatar() const {
601 return IsOffTheRecord() && IsBrowserTypeNormal(); 601 bool should_show_off_the_record_avatar =
602 IsOffTheRecord() && IsBrowserTypeNormal();
603 #if defined(OS_CHROMEOS)
604 should_show_off_the_record_avatar = should_show_off_the_record_avatar &&
605 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
606 #endif
607 return should_show_off_the_record_avatar;
602 } 608 }
603 609
604 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { 610 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
605 std::map<views::Accelerator, int>::const_iterator iter = 611 std::map<views::Accelerator, int>::const_iterator iter =
606 accelerator_table_.find(accelerator); 612 accelerator_table_.find(accelerator);
607 DCHECK(iter != accelerator_table_.end()); 613 DCHECK(iter != accelerator_table_.end());
608 614
609 int command_id = iter->second; 615 int command_id = iter->second;
610 if (browser_->command_updater()->SupportsCommand(command_id) && 616 if (browser_->command_updater()->SupportsCommand(command_id) &&
611 browser_->command_updater()->IsCommandEnabled(command_id)) { 617 browser_->command_updater()->IsCommandEnabled(command_id)) {
(...skipping 1889 matching lines...) Expand 10 before | Expand all | Expand 10 after
2501 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME)); 2507 SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
2502 2508
2503 return view; 2509 return view;
2504 } 2510 }
2505 #endif 2511 #endif
2506 2512
2507 // static 2513 // static
2508 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2514 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2509 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2515 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2510 } 2516 }
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