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

Unified Diff: chrome/browser/ui/startup/startup_tab_provider.cc

Issue 2469363002: Tech Debt Repayment for StartupBrowserCreatorImpl Refactor (Closed)
Patch Set: sky comments Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_tab_provider.cc
diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc
index 70da7e3412a2933ab3062d5c84b33bc66cb91cd2..fdd35dd7f9b23347a1efb35ae6c31209a42aa6fc 100644
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -66,14 +66,14 @@ StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
bool is_default_browser =
g_browser_process->CachedDefaultWebClientState() ==
shell_integration::IS_DEFAULT;
- return CheckWin10OnboardingTabPolicy(
+ return GetWin10OnboardingTabsForState(
is_first_run, has_seen_welcome_page, has_seen_win10_promo, is_signed_in,
set_default_browser_allowed, is_default_browser, is_supervised_user);
}
#endif // defined(OS_WIN)
- return CheckStandardOnboardingTabPolicy(is_first_run, has_seen_welcome_page,
- is_signed_in, is_supervised_user);
+ return GetStandardOnboardingTabsForState(is_first_run, has_seen_welcome_page,
+ is_signed_in, is_supervised_user);
#endif // defined(OS_CHROMEOS)
}
@@ -81,7 +81,7 @@ StartupTabs StartupTabProviderImpl::GetDistributionFirstRunTabs(
StartupBrowserCreator* browser_creator) const {
if (!browser_creator)
return StartupTabs();
- StartupTabs tabs = CheckMasterPrefsTabPolicy(
+ StartupTabs tabs = GetMasterPrefsTabsForState(
first_run::IsChromeFirstRun(), browser_creator->first_run_tabs_);
browser_creator->first_run_tabs_.clear();
return tabs;
@@ -93,13 +93,13 @@ StartupTabs StartupTabProviderImpl::GetResetTriggerTabs(
TriggeredProfileResetterFactory::GetForBrowserContext(profile);
bool has_reset_trigger = triggered_profile_resetter &&
triggered_profile_resetter->HasResetTrigger();
- return CheckResetTriggerTabPolicy(has_reset_trigger);
+ return GetResetTriggerTabsForState(has_reset_trigger);
}
StartupTabs StartupTabProviderImpl::GetPinnedTabs(
const base::CommandLine& command_line,
Profile* profile) const {
- return CheckPinnedTabPolicy(
+ return GetPinnedTabsForState(
StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
PinnedTabCodec::ReadPinnedTabs(profile));
}
@@ -118,7 +118,7 @@ StartupTabs StartupTabProviderImpl::GetPreferencesTabs(
bool profile_has_other_tabbed_browser =
other_tabbed_browser != browser_list->end();
- return CheckPreferencesTabPolicy(
+ return GetPreferencesTabsForState(
StartupBrowserCreator::GetSessionStartupPref(command_line, profile),
profile_has_other_tabbed_browser);
}
@@ -126,12 +126,12 @@ StartupTabs StartupTabProviderImpl::GetPreferencesTabs(
StartupTabs StartupTabProviderImpl::GetNewTabPageTabs(
const base::CommandLine& command_line,
Profile* profile) const {
- return CheckNewTabPageTabPolicy(
+ return GetNewTabPageTabsForState(
StartupBrowserCreator::GetSessionStartupPref(command_line, profile));
}
// static
-StartupTabs StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
+StartupTabs StartupTabProviderImpl::GetStandardOnboardingTabsForState(
bool is_first_run,
bool has_seen_welcome_page,
bool is_signed_in,
@@ -144,7 +144,7 @@ StartupTabs StartupTabProviderImpl::CheckStandardOnboardingTabPolicy(
#if defined(OS_WIN)
// static
-StartupTabs StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
+StartupTabs StartupTabProviderImpl::GetWin10OnboardingTabsForState(
bool is_first_run,
bool has_seen_welcome_page,
bool has_seen_win10_promo,
@@ -168,7 +168,7 @@ StartupTabs StartupTabProviderImpl::CheckWin10OnboardingTabPolicy(
#endif
// static
-StartupTabs StartupTabProviderImpl::CheckMasterPrefsTabPolicy(
+StartupTabs StartupTabProviderImpl::GetMasterPrefsTabsForState(
bool is_first_run,
const std::vector<GURL>& first_run_tabs) {
// Constants: Magic words used by Master Preferences files in place of a URL
@@ -191,7 +191,7 @@ StartupTabs StartupTabProviderImpl::CheckMasterPrefsTabPolicy(
}
// static
-StartupTabs StartupTabProviderImpl::CheckResetTriggerTabPolicy(
+StartupTabs StartupTabProviderImpl::GetResetTriggerTabsForState(
bool profile_has_trigger) {
StartupTabs tabs;
if (profile_has_trigger)
@@ -200,7 +200,7 @@ StartupTabs StartupTabProviderImpl::CheckResetTriggerTabPolicy(
}
// static
-StartupTabs StartupTabProviderImpl::CheckPinnedTabPolicy(
+StartupTabs StartupTabProviderImpl::GetPinnedTabsForState(
const SessionStartupPref& pref,
const StartupTabs& pinned_tabs) {
return (pref.type == SessionStartupPref::Type::LAST) ? StartupTabs()
@@ -208,7 +208,7 @@ StartupTabs StartupTabProviderImpl::CheckPinnedTabPolicy(
}
// static
-StartupTabs StartupTabProviderImpl::CheckPreferencesTabPolicy(
+StartupTabs StartupTabProviderImpl::GetPreferencesTabsForState(
const SessionStartupPref& pref,
bool profile_has_other_tabbed_browser) {
StartupTabs tabs;
@@ -221,7 +221,7 @@ StartupTabs StartupTabProviderImpl::CheckPreferencesTabPolicy(
}
// static
-StartupTabs StartupTabProviderImpl::CheckNewTabPageTabPolicy(
+StartupTabs StartupTabProviderImpl::GetNewTabPageTabsForState(
const SessionStartupPref& pref) {
StartupTabs tabs;
if (pref.type != SessionStartupPref::Type::LAST)
« no previous file with comments | « chrome/browser/ui/startup/startup_tab_provider.h ('k') | chrome/browser/ui/startup/startup_tab_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698