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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator.cc

Issue 608283003: Remove retail mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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/startup/startup_browser_creator.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 #include <set> 8 #include <set>
9 9
10 #include "apps/app_load_service.h" 10 #include "apps/app_load_service.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "content/public/browser/navigation_controller.h" 66 #include "content/public/browser/navigation_controller.h"
67 #include "extensions/common/switches.h" 67 #include "extensions/common/switches.h"
68 #include "net/base/net_util.h" 68 #include "net/base/net_util.h"
69 69
70 #if defined(USE_ASH) 70 #if defined(USE_ASH)
71 #include "ash/shell.h" 71 #include "ash/shell.h"
72 #endif 72 #endif
73 73
74 #if defined(OS_CHROMEOS) 74 #if defined(OS_CHROMEOS)
75 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 75 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
76 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
77 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 76 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
78 #include "chrome/browser/chromeos/profiles/profile_helper.h" 77 #include "chrome/browser/chromeos/profiles/profile_helper.h"
79 #include "chrome/browser/lifetime/application_lifetime.h" 78 #include "chrome/browser/lifetime/application_lifetime.h"
80 #include "chromeos/chromeos_switches.h" 79 #include "chromeos/chromeos_switches.h"
81 #include "components/user_manager/user_manager.h" 80 #include "components/user_manager/user_manager.h"
82 #endif 81 #endif
83 82
84 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 83 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
85 #include "ui/events/devices/x11/touch_factory_x11.h" 84 #include "ui/events/devices/x11/touch_factory_x11.h"
86 #endif 85 #endif
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 // If we are showing the app list then chrome isn't shown so load the app 857 // If we are showing the app list then chrome isn't shown so load the app
859 // list's profile rather than chrome's. 858 // list's profile rather than chrome's.
860 if (command_line.HasSwitch(switches::kShowAppList)) { 859 if (command_line.HasSwitch(switches::kShowAppList)) {
861 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> 860 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
862 GetProfilePath(user_data_dir); 861 GetProfilePath(user_data_dir);
863 } 862 }
864 863
865 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 864 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
866 user_data_dir); 865 user_data_dir);
867 } 866 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698