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

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, 2 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
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "content/public/browser/child_process_security_policy.h" 65 #include "content/public/browser/child_process_security_policy.h"
66 #include "content/public/browser/navigation_controller.h" 66 #include "content/public/browser/navigation_controller.h"
67 #include "net/base/net_util.h" 67 #include "net/base/net_util.h"
68 68
69 #if defined(USE_ASH) 69 #if defined(USE_ASH)
70 #include "ash/shell.h" 70 #include "ash/shell.h"
71 #endif 71 #endif
72 72
73 #if defined(OS_CHROMEOS) 73 #if defined(OS_CHROMEOS)
74 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 74 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
75 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
76 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 75 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
77 #include "chrome/browser/chromeos/profiles/profile_helper.h" 76 #include "chrome/browser/chromeos/profiles/profile_helper.h"
78 #include "chrome/browser/lifetime/application_lifetime.h" 77 #include "chrome/browser/lifetime/application_lifetime.h"
79 #include "chromeos/chromeos_switches.h" 78 #include "chromeos/chromeos_switches.h"
80 #include "components/user_manager/user_manager.h" 79 #include "components/user_manager/user_manager.h"
81 #endif 80 #endif
82 81
83 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 82 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
84 #include "ui/events/x/touch_factory_x11.h" 83 #include "ui/events/x/touch_factory_x11.h"
85 #endif 84 #endif
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 // If we are showing the app list then chrome isn't shown so load the app 744 // If we are showing the app list then chrome isn't shown so load the app
746 // list's profile rather than chrome's. 745 // list's profile rather than chrome's.
747 if (command_line.HasSwitch(switches::kShowAppList)) { 746 if (command_line.HasSwitch(switches::kShowAppList)) {
748 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> 747 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
749 GetProfilePath(user_data_dir); 748 GetProfilePath(user_data_dir);
750 } 749 }
751 750
752 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 751 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
753 user_data_dir); 752 user_data_dir);
754 } 753 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698