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

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

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 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/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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 #include "ui/base/resource/resource_bundle.h" 68 #include "ui/base/resource/resource_bundle.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" 76 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
77 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 77 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
78 #include "chrome/browser/chromeos/login/user_manager.h" 78 #include "chrome/browser/chromeos/login/users/user_manager.h"
79 #include "chrome/browser/chromeos/profiles/profile_helper.h" 79 #include "chrome/browser/chromeos/profiles/profile_helper.h"
80 #include "chrome/browser/lifetime/application_lifetime.h" 80 #include "chrome/browser/lifetime/application_lifetime.h"
81 #include "chromeos/chromeos_switches.h" 81 #include "chromeos/chromeos_switches.h"
82 #endif 82 #endif
83 83
84 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) 84 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
85 #include "ui/events/x/touch_factory_x11.h" 85 #include "ui/events/x/touch_factory_x11.h"
86 #endif 86 #endif
87 87
88 #if defined(ENABLE_FULL_PRINTING) 88 #if defined(ENABLE_FULL_PRINTING)
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 } 728 }
729 729
730 if (command_line.HasSwitch(switches::kProfileDirectory)) { 730 if (command_line.HasSwitch(switches::kProfileDirectory)) {
731 return user_data_dir.Append( 731 return user_data_dir.Append(
732 command_line.GetSwitchValuePath(switches::kProfileDirectory)); 732 command_line.GetSwitchValuePath(switches::kProfileDirectory));
733 } 733 }
734 734
735 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 735 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
736 user_data_dir); 736 user_data_dir);
737 } 737 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_list.cc ('k') | chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698