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

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, 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
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "content/public/browser/child_process_security_policy.h" 64 #include "content/public/browser/child_process_security_policy.h"
65 #include "content/public/browser/navigation_controller.h" 65 #include "content/public/browser/navigation_controller.h"
66 #include "net/base/net_util.h" 66 #include "net/base/net_util.h"
67 67
68 #if defined(USE_ASH) 68 #if defined(USE_ASH)
69 #include "ash/shell.h" 69 #include "ash/shell.h"
70 #endif 70 #endif
71 71
72 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
73 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 73 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
74 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
75 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 74 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
76 #include "chrome/browser/chromeos/profiles/profile_helper.h" 75 #include "chrome/browser/chromeos/profiles/profile_helper.h"
77 #include "chrome/browser/lifetime/application_lifetime.h" 76 #include "chrome/browser/lifetime/application_lifetime.h"
78 #include "chromeos/chromeos_switches.h" 77 #include "chromeos/chromeos_switches.h"
79 #include "components/user_manager/user_manager.h" 78 #include "components/user_manager/user_manager.h"
80 #endif 79 #endif
81 80
82 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 81 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
83 #include "ui/events/devices/x11/touch_factory_x11.h" 82 #include "ui/events/devices/x11/touch_factory_x11.h"
84 #endif 83 #endif
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 // If we are showing the app list then chrome isn't shown so load the app 806 // If we are showing the app list then chrome isn't shown so load the app
808 // list's profile rather than chrome's. 807 // list's profile rather than chrome's.
809 if (command_line.HasSwitch(switches::kShowAppList)) { 808 if (command_line.HasSwitch(switches::kShowAppList)) {
810 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> 809 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
811 GetProfilePath(user_data_dir); 810 GetProfilePath(user_data_dir);
812 } 811 }
813 812
814 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 813 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
815 user_data_dir); 814 user_data_dir);
816 } 815 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698