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_impl.h" | 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "apps/app_restore_service.h" | 10 #include "apps/app_restore_service.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 #include "chrome/browser/sessions/session_restore.h" | 47 #include "chrome/browser/sessions/session_restore.h" |
48 #include "chrome/browser/sessions/session_service.h" | 48 #include "chrome/browser/sessions/session_service.h" |
49 #include "chrome/browser/sessions/session_service_factory.h" | 49 #include "chrome/browser/sessions/session_service_factory.h" |
50 #include "chrome/browser/shell_integration.h" | 50 #include "chrome/browser/shell_integration.h" |
51 #include "chrome/browser/signin/signin_promo.h" | 51 #include "chrome/browser/signin/signin_promo.h" |
52 #include "chrome/browser/ui/app_list/app_list_service.h" | 52 #include "chrome/browser/ui/app_list/app_list_service.h" |
53 #include "chrome/browser/ui/browser_commands.h" | 53 #include "chrome/browser/ui/browser_commands.h" |
54 #include "chrome/browser/ui/browser_finder.h" | 54 #include "chrome/browser/ui/browser_finder.h" |
55 #include "chrome/browser/ui/browser_list.h" | 55 #include "chrome/browser/ui/browser_list.h" |
56 #include "chrome/browser/ui/browser_navigator.h" | 56 #include "chrome/browser/ui/browser_navigator.h" |
| 57 #include "chrome/browser/ui/browser_navigator_params.h" |
57 #include "chrome/browser/ui/browser_tabrestore.h" | 58 #include "chrome/browser/ui/browser_tabrestore.h" |
58 #include "chrome/browser/ui/browser_tabstrip.h" | 59 #include "chrome/browser/ui/browser_tabstrip.h" |
59 #include "chrome/browser/ui/browser_window.h" | 60 #include "chrome/browser/ui/browser_window.h" |
60 #include "chrome/browser/ui/chrome_pages.h" | 61 #include "chrome/browser/ui/chrome_pages.h" |
61 #include "chrome/browser/ui/extensions/app_launch_params.h" | 62 #include "chrome/browser/ui/extensions/app_launch_params.h" |
62 #include "chrome/browser/ui/extensions/application_launch.h" | 63 #include "chrome/browser/ui/extensions/application_launch.h" |
63 #include "chrome/browser/ui/host_desktop.h" | 64 #include "chrome/browser/ui/host_desktop.h" |
64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 65 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
65 #include "chrome/browser/ui/startup/bad_flags_prompt.h" | 66 #include "chrome/browser/ui/startup/bad_flags_prompt.h" |
66 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 67 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
998 TriggeredProfileResetter* triggered_profile_resetter = | 999 TriggeredProfileResetter* triggered_profile_resetter = |
999 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); | 1000 TriggeredProfileResetterFactory::GetForBrowserContext(profile_); |
1000 // TriggeredProfileResetter instance will be nullptr for incognito profiles. | 1001 // TriggeredProfileResetter instance will be nullptr for incognito profiles. |
1001 if (triggered_profile_resetter) { | 1002 if (triggered_profile_resetter) { |
1002 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); | 1003 has_reset_trigger = triggered_profile_resetter->HasResetTrigger(); |
1003 triggered_profile_resetter->ClearResetTrigger(); | 1004 triggered_profile_resetter->ClearResetTrigger(); |
1004 } | 1005 } |
1005 #endif // defined(OS_WIN) | 1006 #endif // defined(OS_WIN) |
1006 return has_reset_trigger; | 1007 return has_reset_trigger; |
1007 } | 1008 } |
OLD | NEW |