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

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

Issue 10837158: mac: Delete more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "chrome/browser/ui/browser_finder.h" 46 #include "chrome/browser/ui/browser_finder.h"
47 #include "chrome/browser/ui/browser_list.h" 47 #include "chrome/browser/ui/browser_list.h"
48 #include "chrome/browser/ui/browser_navigator.h" 48 #include "chrome/browser/ui/browser_navigator.h"
49 #include "chrome/browser/ui/browser_tabrestore.h" 49 #include "chrome/browser/ui/browser_tabrestore.h"
50 #include "chrome/browser/ui/browser_tabstrip.h" 50 #include "chrome/browser/ui/browser_tabstrip.h"
51 #include "chrome/browser/ui/browser_window.h" 51 #include "chrome/browser/ui/browser_window.h"
52 #include "chrome/browser/ui/extensions/application_launch.h" 52 #include "chrome/browser/ui/extensions/application_launch.h"
53 #include "chrome/browser/ui/startup/autolaunch_prompt.h" 53 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
54 #include "chrome/browser/ui/startup/bad_flags_prompt.h" 54 #include "chrome/browser/ui/startup/bad_flags_prompt.h"
55 #include "chrome/browser/ui/startup/default_browser_prompt.h" 55 #include "chrome/browser/ui/startup/default_browser_prompt.h"
56 #include "chrome/browser/ui/startup/obsolete_os_prompt.h"
57 #include "chrome/browser/ui/startup/session_crashed_prompt.h" 56 #include "chrome/browser/ui/startup/session_crashed_prompt.h"
58 #include "chrome/browser/ui/startup/startup_browser_creator.h" 57 #include "chrome/browser/ui/startup/startup_browser_creator.h"
59 #include "chrome/browser/ui/tab_contents/tab_contents.h" 58 #include "chrome/browser/ui/tab_contents/tab_contents.h"
60 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 59 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
61 #include "chrome/browser/ui/tabs/tab_strip_model.h" 60 #include "chrome/browser/ui/tabs/tab_strip_model.h"
62 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" 61 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
63 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h" 62 #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h"
64 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" 63 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
65 #include "chrome/common/chrome_constants.h" 64 #include "chrome/common/chrome_constants.h"
66 #include "chrome/common/chrome_notification_types.h" 65 #include "chrome/common/chrome_notification_types.h"
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 796
798 if (HasPendingUncleanExit(browser->profile())) 797 if (HasPendingUncleanExit(browser->profile()))
799 chrome::ShowSessionCrashedPrompt(browser); 798 chrome::ShowSessionCrashedPrompt(browser);
800 799
801 // The bad flags info bar and the obsolete system info bar are only added to 800 // The bad flags info bar and the obsolete system info bar are only added to
802 // the first profile which is launched. Other profiles might be restoring the 801 // the first profile which is launched. Other profiles might be restoring the
803 // browsing sessions asynchronously, so we cannot add the info bars to the 802 // browsing sessions asynchronously, so we cannot add the info bars to the
804 // focused tabs here. 803 // focused tabs here.
805 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) { 804 if (is_process_startup == chrome::startup::IS_PROCESS_STARTUP) {
806 chrome::ShowBadFlagsPrompt(browser); 805 chrome::ShowBadFlagsPrompt(browser);
807 chrome::ShowObsoleteOSPrompt(browser);
808 } 806 }
809 } 807 }
810 808
811 809
812 void StartupBrowserCreatorImpl::AddStartupURLs( 810 void StartupBrowserCreatorImpl::AddStartupURLs(
813 std::vector<GURL>* startup_urls) const { 811 std::vector<GURL>* startup_urls) const {
814 // If we have urls specified by the first run master preferences use them 812 // If we have urls specified by the first run master preferences use them
815 // and nothing else. 813 // and nothing else.
816 if (browser_creator_ && startup_urls->empty()) { 814 if (browser_creator_ && startup_urls->empty()) {
817 if (!browser_creator_->first_run_tabs_.empty()) { 815 if (!browser_creator_->first_run_tabs_.empty()) {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 // New: 922 // New:
925 prefs->GetString(prefs::kHomePage), 923 prefs->GetString(prefs::kHomePage),
926 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), 924 prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
927 prefs->GetBoolean(prefs::kShowHomeButton), 925 prefs->GetBoolean(prefs::kShowHomeButton),
928 // Backup: 926 // Backup:
929 backup_homepage, 927 backup_homepage,
930 backup_homepage_is_ntp, 928 backup_homepage_is_ntp,
931 backup_show_home_button)); 929 backup_show_home_button));
932 } 930 }
933 } 931 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698