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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 14139003: Chrome OS multi-profiles backend and UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move IsMultiProfilesEnabled() out of cros Created 7 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/host/root_window_host_factory.h" 8 #include "ash/host/root_window_host_factory.h"
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 bool ChromeShellDelegate::UseImmersiveFullscreen() { 64 bool ChromeShellDelegate::UseImmersiveFullscreen() {
65 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
66 // Kiosk mode needs the whole screen. 66 // Kiosk mode needs the whole screen.
67 CommandLine* command_line = CommandLine::ForCurrentProcess(); 67 CommandLine* command_line = CommandLine::ForCurrentProcess();
68 return !command_line->HasSwitch(switches::kKioskMode) && 68 return !command_line->HasSwitch(switches::kKioskMode) &&
69 command_line->HasSwitch(ash::switches::kAshImmersiveFullscreen); 69 command_line->HasSwitch(ash::switches::kAshImmersiveFullscreen);
70 #endif 70 #endif
71 return false; 71 return false;
72 } 72 }
73 73
74 bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
75 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
76 }
77
74 bool ChromeShellDelegate::IsRunningInForcedAppMode() const { 78 bool ChromeShellDelegate::IsRunningInForcedAppMode() const {
75 return chrome::IsRunningInForcedAppMode(); 79 return chrome::IsRunningInForcedAppMode();
76 } 80 }
77 81
78 void ChromeShellDelegate::UnlockScreen() { 82 void ChromeShellDelegate::UnlockScreen() {
79 // This is used only for testing thus far. 83 // This is used only for testing thus far.
80 NOTIMPLEMENTED(); 84 NOTIMPLEMENTED();
81 } 85 }
82 86
83 void ChromeShellDelegate::Exit() { 87 void ChromeShellDelegate::Exit() {
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 return browser; 363 return browser;
360 return chrome::FindOrCreateTabbedBrowser( 364 return chrome::FindOrCreateTabbedBrowser(
361 ProfileManager::GetDefaultProfileOrOffTheRecord(), 365 ProfileManager::GetDefaultProfileOrOffTheRecord(),
362 chrome::HOST_DESKTOP_TYPE_ASH); 366 chrome::HOST_DESKTOP_TYPE_ASH);
363 } 367 }
364 368
365 keyboard::KeyboardControllerProxy* 369 keyboard::KeyboardControllerProxy*
366 ChromeShellDelegate::CreateKeyboardControllerProxy() { 370 ChromeShellDelegate::CreateKeyboardControllerProxy() {
367 return new AshKeyboardControllerProxy(); 371 return new AshKeyboardControllerProxy();
368 } 372 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698