OLD | NEW |
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 #include "chrome/common/pref_names.h" | 58 #include "chrome/common/pref_names.h" |
59 #include "chrome/common/url_constants.h" | 59 #include "chrome/common/url_constants.h" |
60 #include "chrome/installer/util/browser_distribution.h" | 60 #include "chrome/installer/util/browser_distribution.h" |
61 #include "components/google/core/browser/google_util.h" | 61 #include "components/google/core/browser/google_util.h" |
62 #include "components/search_engines/util.h" | 62 #include "components/search_engines/util.h" |
63 #include "components/signin/core/common/profile_management_switches.h" | 63 #include "components/signin/core/common/profile_management_switches.h" |
64 #include "components/url_fixer/url_fixer.h" | 64 #include "components/url_fixer/url_fixer.h" |
65 #include "content/public/browser/browser_thread.h" | 65 #include "content/public/browser/browser_thread.h" |
66 #include "content/public/browser/child_process_security_policy.h" | 66 #include "content/public/browser/child_process_security_policy.h" |
67 #include "content/public/browser/navigation_controller.h" | 67 #include "content/public/browser/navigation_controller.h" |
| 68 #include "content/public/common/content_switches.h" |
68 #include "extensions/common/switches.h" | 69 #include "extensions/common/switches.h" |
69 #include "net/base/net_util.h" | 70 #include "net/base/net_util.h" |
70 | 71 |
71 #if defined(USE_ASH) | 72 #if defined(USE_ASH) |
72 #include "ash/shell.h" | 73 #include "ash/shell.h" |
73 #endif | 74 #endif |
74 | 75 |
75 #if defined(OS_CHROMEOS) | 76 #if defined(OS_CHROMEOS) |
76 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" | 77 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" |
77 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" | 78 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 // 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 |
857 // list's profile rather than chrome's. | 858 // list's profile rather than chrome's. |
858 if (command_line.HasSwitch(switches::kShowAppList)) { | 859 if (command_line.HasSwitch(switches::kShowAppList)) { |
859 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> | 860 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> |
860 GetProfilePath(user_data_dir); | 861 GetProfilePath(user_data_dir); |
861 } | 862 } |
862 | 863 |
863 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 864 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
864 user_data_dir); | 865 user_data_dir); |
865 } | 866 } |
OLD | NEW |