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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 #include "chrome/installer/util/browser_distribution.h" | 62 #include "chrome/installer/util/browser_distribution.h" |
63 #include "components/google/core/browser/google_util.h" | 63 #include "components/google/core/browser/google_util.h" |
64 #include "components/search_engines/util.h" | 64 #include "components/search_engines/util.h" |
65 #include "components/signin/core/common/profile_management_switches.h" | 65 #include "components/signin/core/common/profile_management_switches.h" |
66 #include "components/url_fixer/url_fixer.h" | 66 #include "components/url_fixer/url_fixer.h" |
67 #include "content/public/browser/browser_thread.h" | 67 #include "content/public/browser/browser_thread.h" |
68 #include "content/public/browser/child_process_security_policy.h" | 68 #include "content/public/browser/child_process_security_policy.h" |
69 #include "content/public/browser/navigation_controller.h" | 69 #include "content/public/browser/navigation_controller.h" |
70 #include "content/public/common/content_switches.h" | 70 #include "content/public/common/content_switches.h" |
71 #include "extensions/common/switches.h" | 71 #include "extensions/common/switches.h" |
72 #include "net/base/net_util.h" | 72 #include "net/base/port_util.h" |
73 | 73 |
74 #if defined(USE_ASH) | 74 #if defined(USE_ASH) |
75 #include "ash/shell.h" | 75 #include "ash/shell.h" |
76 #endif | 76 #endif |
77 | 77 |
78 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
79 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" | 79 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" |
80 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" | 80 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
81 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 81 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
82 #include "chrome/browser/lifetime/application_lifetime.h" | 82 #include "chrome/browser/lifetime/application_lifetime.h" |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
860 // If we are showing the app list then chrome isn't shown so load the app | 860 // If we are showing the app list then chrome isn't shown so load the app |
861 // list's profile rather than chrome's. | 861 // list's profile rather than chrome's. |
862 if (command_line.HasSwitch(switches::kShowAppList)) { | 862 if (command_line.HasSwitch(switches::kShowAppList)) { |
863 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> | 863 return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)-> |
864 GetProfilePath(user_data_dir); | 864 GetProfilePath(user_data_dir); |
865 } | 865 } |
866 | 866 |
867 return g_browser_process->profile_manager()->GetLastUsedProfileDir( | 867 return g_browser_process->profile_manager()->GetLastUsedProfileDir( |
868 user_data_dir); | 868 user_data_dir); |
869 } | 869 } |
OLD | NEW |