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

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

Issue 7329034: Multi-Profiles: Enable multi-profiles by default for views ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Multi-Profiles: Enable multi-profiles by default for views ui Created 9 years, 5 months 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 bool BrowserView::IsOffTheRecord() const { 469 bool BrowserView::IsOffTheRecord() const {
470 return browser_->profile()->IsOffTheRecord(); 470 return browser_->profile()->IsOffTheRecord();
471 } 471 }
472 472
473 bool BrowserView::ShouldShowAvatar() const { 473 bool BrowserView::ShouldShowAvatar() const {
474 if (!IsBrowserTypeNormal()) 474 if (!IsBrowserTypeNormal())
475 return false; 475 return false;
476 if (IsOffTheRecord()) 476 if (IsOffTheRecord())
477 return true; 477 return true;
478 478
479 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles)) { 479 if (ProfileManager::IsMultipleProfilesEnabled()) {
480 // TODO(sail): Once the multi-profile options UI is done we only want to 480 // TODO(sail): Once the multi-profile options UI is done we only want to
481 // show the avatar if the user has more than one profile. 481 // show the avatar if the user has more than one profile.
482 return true; 482 return true;
483 } 483 }
484 484
485 return false; 485 return false;
486 } 486 }
487 487
488 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) { 488 bool BrowserView::AcceleratorPressed(const views::Accelerator& accelerator) {
489 #if defined(OS_CHROMEOS) 489 #if defined(OS_CHROMEOS)
(...skipping 2146 matching lines...) Expand 10 before | Expand all | Expand 10 after
2636 view->GetWidget()->non_client_view()->SetAccessibleName( 2636 view->GetWidget()->non_client_view()->SetAccessibleName(
2637 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 2637 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
2638 return view; 2638 return view;
2639 } 2639 }
2640 #endif 2640 #endif
2641 2641
2642 // static 2642 // static
2643 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2643 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2644 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2644 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2645 } 2645 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/browser_titlebar.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698