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

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

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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"
11 #include "apps/switches.h" 11 #include "apps/switches.h"
12 #include "ash/shell.h"
13 #include "base/bind.h" 12 #include "base/bind.h"
14 #include "base/bind_helpers.h" 13 #include "base/bind_helpers.h"
15 #include "base/command_line.h" 14 #include "base/command_line.h"
16 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
17 #include "base/environment.h" 16 #include "base/environment.h"
18 #include "base/file_util.h" 17 #include "base/file_util.h"
19 #include "base/files/file_path.h" 18 #include "base/files/file_path.h"
20 #include "base/lazy_instance.h" 19 #include "base/lazy_instance.h"
21 #include "base/logging.h" 20 #include "base/logging.h"
22 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "chrome/common/url_constants.h" 63 #include "chrome/common/url_constants.h"
65 #include "chrome/installer/util/browser_distribution.h" 64 #include "chrome/installer/util/browser_distribution.h"
66 #include "content/public/browser/browser_thread.h" 65 #include "content/public/browser/browser_thread.h"
67 #include "content/public/browser/child_process_security_policy.h" 66 #include "content/public/browser/child_process_security_policy.h"
68 #include "content/public/browser/navigation_controller.h" 67 #include "content/public/browser/navigation_controller.h"
69 #include "grit/locale_settings.h" 68 #include "grit/locale_settings.h"
70 #include "net/base/net_util.h" 69 #include "net/base/net_util.h"
71 #include "ui/base/l10n/l10n_util.h" 70 #include "ui/base/l10n/l10n_util.h"
72 #include "ui/base/resource/resource_bundle.h" 71 #include "ui/base/resource/resource_bundle.h"
73 72
73 #if defined(USE_ASH)
74 #include "ash/shell.h"
75 #endif
76
74 #if defined(OS_CHROMEOS) 77 #if defined(OS_CHROMEOS)
75 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" 78 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
76 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 79 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
77 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" 80 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
78 #include "chrome/browser/chromeos/login/user_manager.h" 81 #include "chrome/browser/chromeos/login/user_manager.h"
79 #include "chrome/browser/chromeos/profiles/profile_helper.h" 82 #include "chrome/browser/chromeos/profiles/profile_helper.h"
80 #include "chrome/browser/lifetime/application_lifetime.h" 83 #include "chrome/browser/lifetime/application_lifetime.h"
81 #include "chromeos/chromeos_switches.h" 84 #include "chromeos/chromeos_switches.h"
82 #endif 85 #endif
83 86
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 } 820 }
818 821
819 if (command_line.HasSwitch(switches::kProfileDirectory)) { 822 if (command_line.HasSwitch(switches::kProfileDirectory)) {
820 return user_data_dir.Append( 823 return user_data_dir.Append(
821 command_line.GetSwitchValuePath(switches::kProfileDirectory)); 824 command_line.GetSwitchValuePath(switches::kProfileDirectory));
822 } 825 }
823 826
824 return g_browser_process->profile_manager()->GetLastUsedProfileDir( 827 return g_browser_process->profile_manager()->GetLastUsedProfileDir(
825 user_data_dir); 828 user_data_dir);
826 } 829 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698