| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 #include "chrome/browser/ui/browser_navigator.h" | 58 #include "chrome/browser/ui/browser_navigator.h" |
| 59 #include "chrome/browser/ui/browser_tabrestore.h" | 59 #include "chrome/browser/ui/browser_tabrestore.h" |
| 60 #include "chrome/browser/ui/browser_tabstrip.h" | 60 #include "chrome/browser/ui/browser_tabstrip.h" |
| 61 #include "chrome/browser/ui/browser_window.h" | 61 #include "chrome/browser/ui/browser_window.h" |
| 62 #include "chrome/browser/ui/extensions/application_launch.h" | 62 #include "chrome/browser/ui/extensions/application_launch.h" |
| 63 #include "chrome/browser/ui/host_desktop.h" | 63 #include "chrome/browser/ui/host_desktop.h" |
| 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" | 64 #include "chrome/browser/ui/startup/autolaunch_prompt.h" |
| 65 #include "chrome/browser/ui/startup/bad_flags_prompt.h" | 65 #include "chrome/browser/ui/startup/bad_flags_prompt.h" |
| 66 #include "chrome/browser/ui/startup/default_browser_prompt.h" | 66 #include "chrome/browser/ui/startup/default_browser_prompt.h" |
| 67 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h" | 67 #include "chrome/browser/ui/startup/google_api_keys_infobar_delegate.h" |
| 68 #include "chrome/browser/ui/startup/obsolete_os_infobar_delegate.h" | 68 #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h" |
| 69 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h" | 69 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h" |
| 70 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 70 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" | 71 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" |
| 72 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 72 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 73 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
| 74 #include "chrome/common/chrome_constants.h" | 74 #include "chrome/common/chrome_constants.h" |
| 75 #include "chrome/common/chrome_paths.h" | 75 #include "chrome/common/chrome_paths.h" |
| 76 #include "chrome/common/chrome_result_codes.h" | 76 #include "chrome/common/chrome_result_codes.h" |
| 77 #include "chrome/common/chrome_switches.h" | 77 #include "chrome/common/chrome_switches.h" |
| 78 #include "chrome/common/chrome_version_info.h" | 78 #include "chrome/common/chrome_version_info.h" |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 SessionCrashedInfoBarDelegate::Create(browser); | 898 SessionCrashedInfoBarDelegate::Create(browser); |
| 899 | 899 |
| 900 // The below info bars are only added to the first profile which is launched. | 900 // The below info bars are only added to the first profile which is launched. |
| 901 // Other profiles might be restoring the browsing sessions asynchronously, | 901 // Other profiles might be restoring the browsing sessions asynchronously, |
| 902 // so we cannot add the info bars to the focused tabs here. | 902 // so we cannot add the info bars to the focused tabs here. |
| 903 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP && | 903 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP && |
| 904 !command_line_.HasSwitch(switches::kTestType)) { | 904 !command_line_.HasSwitch(switches::kTestType)) { |
| 905 chrome::ShowBadFlagsPrompt(browser); | 905 chrome::ShowBadFlagsPrompt(browser); |
| 906 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents( | 906 GoogleApiKeysInfoBarDelegate::Create(InfoBarService::FromWebContents( |
| 907 browser->tab_strip_model()->GetActiveWebContents())); | 907 browser->tab_strip_model()->GetActiveWebContents())); |
| 908 ObsoleteOSInfoBarDelegate::Create(InfoBarService::FromWebContents( | 908 ObsoleteSystemInfoBarDelegate::Create(InfoBarService::FromWebContents( |
| 909 browser->tab_strip_model()->GetActiveWebContents())); | 909 browser->tab_strip_model()->GetActiveWebContents())); |
| 910 | 910 |
| 911 #if !defined(OS_CHROMEOS) | 911 #if !defined(OS_CHROMEOS) |
| 912 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) { | 912 if (!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) { |
| 913 // Generally, the default browser prompt should not be shown on first | 913 // Generally, the default browser prompt should not be shown on first |
| 914 // run. However, when the set-as-default dialog has been suppressed, we | 914 // run. However, when the set-as-default dialog has been suppressed, we |
| 915 // need to allow it. | 915 // need to allow it. |
| 916 if ((!is_first_run_ || | 916 if ((!is_first_run_ || |
| 917 (browser_creator_ && | 917 (browser_creator_ && |
| 918 browser_creator_->is_default_browser_dialog_suppressed())) && | 918 browser_creator_->is_default_browser_dialog_suppressed())) && |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 } | 989 } |
| 990 | 990 |
| 991 #if !defined(OS_WIN) | 991 #if !defined(OS_WIN) |
| 992 // static | 992 // static |
| 993 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( | 993 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( |
| 994 Profile* profile, | 994 Profile* profile, |
| 995 const std::vector<GURL>& startup_urls) { | 995 const std::vector<GURL>& startup_urls) { |
| 996 return false; | 996 return false; |
| 997 } | 997 } |
| 998 #endif | 998 #endif |
| OLD | NEW |