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

Side by Side Diff: chrome/browser/ui/startup/startup_tab_provider.h

Issue 2625793002: Fix the logic that determines when to show the Win 10 promo page. (Closed)
Patch Set: Rebase comments add braces Created 3 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_tab_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_
6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_ 6 #define CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // Determines which tabs should be shown according to onboarding/first 61 // Determines which tabs should be shown according to onboarding/first
62 // run policy. 62 // run policy.
63 static StartupTabs CheckStandardOnboardingTabPolicy( 63 static StartupTabs CheckStandardOnboardingTabPolicy(
64 bool is_first_run, 64 bool is_first_run,
65 bool has_seen_welcome_page, 65 bool has_seen_welcome_page,
66 bool is_signed_in); 66 bool is_signed_in);
67 67
68 #if defined(OS_WIN) 68 #if defined(OS_WIN)
69 // Determines which tabs should be shown according to onboarding/first run 69 // Determines which tabs should be shown according to onboarding/first run
70 // policy, including promo content specific to Windows 10. 70 // policy, including promo content specific to Windows 10.
71 static StartupTabs CheckWin10OnboardingTabPolicy(bool is_first_run, 71 static StartupTabs CheckWin10OnboardingTabPolicy(
72 bool has_seen_welcome_page, 72 bool is_first_run,
73 bool has_seen_win10_promo, 73 bool has_seen_welcome_page,
74 bool is_signed_in, 74 bool has_seen_win10_promo,
75 bool is_default_browser); 75 bool is_signed_in,
76 bool set_default_browser_allowed,
77 bool is_default_browser);
76 #endif 78 #endif
77 79
78 // Processes first run URLs specified in Master Preferences file, replacing 80 // Processes first run URLs specified in Master Preferences file, replacing
79 // any "magic word" URL hosts with appropriate URLs. 81 // any "magic word" URL hosts with appropriate URLs.
80 static StartupTabs CheckMasterPrefsTabPolicy( 82 static StartupTabs CheckMasterPrefsTabPolicy(
81 bool is_first_run, 83 bool is_first_run,
82 const std::vector<GURL>& first_run_tabs); 84 const std::vector<GURL>& first_run_tabs);
83 85
84 // Determines which tabs should be shown as a result of the presence/absence 86 // Determines which tabs should be shown as a result of the presence/absence
85 // of a Reset Trigger on this profile. 87 // of a Reset Trigger on this profile.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 StartupTabs GetPreferencesTabs(const base::CommandLine& command_line, 131 StartupTabs GetPreferencesTabs(const base::CommandLine& command_line,
130 Profile* profile) const override; 132 Profile* profile) const override;
131 StartupTabs GetNewTabPageTabs(const base::CommandLine& command_line, 133 StartupTabs GetNewTabPageTabs(const base::CommandLine& command_line,
132 Profile* profile) const override; 134 Profile* profile) const override;
133 135
134 private: 136 private:
135 DISALLOW_COPY_AND_ASSIGN(StartupTabProviderImpl); 137 DISALLOW_COPY_AND_ASSIGN(StartupTabProviderImpl);
136 }; 138 };
137 139
138 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_ 140 #endif // CHROME_BROWSER_UI_STARTUP_STARTUP_TAB_PROVIDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_tab_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698