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

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

Issue 11773036: ObsoleteOSInfoBar -> ObsoleteOSInfoBarDelegate, for consistency with other infobar delegates. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 8 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_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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/ui/browser_list.h" 54 #include "chrome/browser/ui/browser_list.h"
55 #include "chrome/browser/ui/browser_navigator.h" 55 #include "chrome/browser/ui/browser_navigator.h"
56 #include "chrome/browser/ui/browser_tabrestore.h" 56 #include "chrome/browser/ui/browser_tabrestore.h"
57 #include "chrome/browser/ui/browser_tabstrip.h" 57 #include "chrome/browser/ui/browser_tabstrip.h"
58 #include "chrome/browser/ui/browser_window.h" 58 #include "chrome/browser/ui/browser_window.h"
59 #include "chrome/browser/ui/extensions/application_launch.h" 59 #include "chrome/browser/ui/extensions/application_launch.h"
60 #include "chrome/browser/ui/host_desktop.h" 60 #include "chrome/browser/ui/host_desktop.h"
61 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 61 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
62 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 62 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
63 #include "chrome/browser/ui/startup/default_browser_prompt.h" 63 #include "chrome/browser/ui/startup/default_browser_prompt.h"
64 #include "chrome/browser/ui/startup/obsolete_os_info_bar.h" 64 #include "chrome/browser/ui/startup/obsolete_os_infobar_delegate.h"
65 #include "chrome/browser/ui/startup/session_crashed_prompt.h" 65 #include "chrome/browser/ui/startup/session_crashed_prompt.h"
66 #include "chrome/browser/ui/startup/startup_browser_creator.h" 66 #include "chrome/browser/ui/startup/startup_browser_creator.h"
67 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 67 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
68 #include "chrome/browser/ui/tabs/tab_strip_model.h" 68 #include "chrome/browser/ui/tabs/tab_strip_model.h"
69 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" 69 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h" 70 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
71 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 71 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
72 #include "chrome/common/chrome_constants.h" 72 #include "chrome/common/chrome_constants.h"
73 #include "chrome/common/chrome_notification_types.h" 73 #include "chrome/common/chrome_notification_types.h"
74 #include "chrome/common/chrome_paths.h" 74 #include "chrome/common/chrome_paths.h"
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 898
899 // The bad flags info bar and the obsolete system info bar are only added to 899 // The bad flags info bar and the obsolete system info bar are only added to
900 // the first profile which is launched. Other profiles might be restoring the 900 // the first profile which is launched. Other profiles might be restoring the
901 // browsing sessions asynchronously, so we cannot add the info bars to the 901 // browsing sessions asynchronously, so we cannot add the info bars to the
902 // focused tabs here. 902 // focused tabs here.
903 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) { 903 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) {
904 chrome::ShowBadFlagsPrompt(browser); 904 chrome::ShowBadFlagsPrompt(browser);
905 // TODO(phajdan.jr): Always enable after migrating bots: 905 // TODO(phajdan.jr): Always enable after migrating bots:
906 // http://crbug.com/170262 . 906 // http://crbug.com/170262 .
907 if (!command_line_.HasSwitch(switches::kTestType)) { 907 if (!command_line_.HasSwitch(switches::kTestType)) {
908 chrome::ObsoleteOSInfoBar::Create( 908 chrome::ObsoleteOSInfoBarDelegate::Create(
909 InfoBarService::FromWebContents( 909 InfoBarService::FromWebContents(
910 browser->tab_strip_model()->GetActiveWebContents())); 910 browser->tab_strip_model()->GetActiveWebContents()));
911 } 911 }
912 912
913 if (browser_defaults::kOSSupportsOtherBrowsers && 913 if (browser_defaults::kOSSupportsOtherBrowsers &&
914 !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) { 914 !command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
915 // Generally, the default browser prompt should not be shown on first 915 // Generally, the default browser prompt should not be shown on first
916 // run. However, when the set-as-default dialog has been suppressed, we 916 // run. However, when the set-as-default dialog has been suppressed, we
917 // need to allow it. 917 // need to allow it.
918 if ((!is_first_run_ || 918 if ((!is_first_run_ ||
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
980 } 980 }
981 981
982 #if !defined(OS_WIN) || defined(USE_AURA) 982 #if !defined(OS_WIN) || defined(USE_AURA)
983 // static 983 // static
984 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser( 984 bool StartupBrowserCreatorImpl::OpenStartupURLsInExistingBrowser(
985 Profile* profile, 985 Profile* profile,
986 const std::vector<GURL>& startup_urls) { 986 const std::vector<GURL>& startup_urls) {
987 return false; 987 return false;
988 } 988 }
989 #endif 989 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/obsolete_os_infobar_delegate.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698