Add a default browser prompt subfolder
Change-Id: I1448b98d314c2f992658e158411e4be210b90fca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5512979
Reviewed-by: Erik Chen <[email protected]>
Commit-Queue: Alison Gale <[email protected]>
Reviewed-by: Eshwar Stalin <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1298152}
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 6797fbb..9a234596 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -45,7 +45,7 @@
#endif
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
-#include "chrome/browser/ui/startup/default_browser_prompt_trial.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
#endif
ChromeBrowserFieldTrials::ChromeBrowserFieldTrials(PrefService* local_state)
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index 6ea310b..05f9e638 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -67,7 +67,7 @@
#endif
#if !BUILDFLAG(IS_CHROMEOS_ASH)
-#include "chrome/browser/ui/startup/default_browser_infobar_delegate.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h"
#endif
#if BUILDFLAG(IS_MAC) && BUILDFLAG(ENABLE_UPDATER)
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 47e549d..bf86efb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -522,7 +522,7 @@
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
#include "chrome/browser/device_identity/device_oauth2_token_store_desktop.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
#endif
#if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index ebafcc86..bf88c89 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1477,12 +1477,12 @@
"singleton_tabs.h",
"startup/automation_infobar_delegate.cc",
"startup/automation_infobar_delegate.h",
- "startup/default_browser_infobar_delegate.cc",
- "startup/default_browser_infobar_delegate.h",
- "startup/default_browser_prompt_manager.cc",
- "startup/default_browser_prompt_manager.h",
- "startup/default_browser_prompt_prefs.cc",
- "startup/default_browser_prompt_prefs.h",
+ "startup/default_browser_prompt/default_browser_infobar_delegate.cc",
+ "startup/default_browser_prompt/default_browser_infobar_delegate.h",
+ "startup/default_browser_prompt/default_browser_prompt_manager.cc",
+ "startup/default_browser_prompt/default_browser_prompt_manager.h",
+ "startup/default_browser_prompt/default_browser_prompt_prefs.cc",
+ "startup/default_browser_prompt/default_browser_prompt_prefs.h",
"startup/google_api_keys_infobar_delegate.cc",
"startup/google_api_keys_infobar_delegate.h",
"startup/infobar_utils.cc",
@@ -4275,8 +4275,8 @@
if (is_win || is_mac || is_linux) {
sources += [
- "startup/default_browser_prompt.cc",
- "startup/default_browser_prompt.h",
+ "startup/default_browser_prompt/default_browser_prompt.cc",
+ "startup/default_browser_prompt/default_browser_prompt.h",
"views/web_apps/deprecated_apps_dialog_view.cc",
"views/web_apps/deprecated_apps_dialog_view.h",
"views/web_apps/force_installed_deprecated_apps_dialog_view.cc",
@@ -4325,8 +4325,8 @@
"profiles/profile_picker.h",
"signin/signin_reauth_view_controller.cc",
"signin/signin_reauth_view_controller.h",
- "startup/default_browser_prompt_trial.cc",
- "startup/default_browser_prompt_trial.h",
+ "startup/default_browser_prompt/default_browser_prompt_trial.cc",
+ "startup/default_browser_prompt/default_browser_prompt_trial.h",
"startup/first_run_service.cc",
"startup/first_run_service.h",
"views/profiles/badged_profile_photo.cc",
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index b98e27e..77d177a 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -52,8 +52,8 @@
#include "chrome/browser/ui/side_panel/side_panel_enums.h"
#include "chrome/browser/ui/side_panel/side_panel_ui.h"
#include "chrome/browser/ui/singleton_tabs.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h"
#include "chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.h"
diff --git a/chrome/browser/ui/startup/default_browser_prompt/OWNERS b/chrome/browser/ui/startup/default_browser_prompt/OWNERS
new file mode 100644
index 0000000..dcb63d3
--- /dev/null
+++ b/chrome/browser/ui/startup/default_browser_prompt/OWNERS
@@ -0,0 +1,2 @@
[email protected]
[email protected]
diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc
similarity index 93%
rename from chrome/browser/ui/startup/default_browser_infobar_delegate.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc
index c2965a7..4bb4c25 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_infobar_delegate.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h"
#include <memory>
@@ -17,9 +17,9 @@
#include "chrome/browser/infobars/confirm_infobar_creator.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/branded_strings.h"
diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h
similarity index 90%
rename from chrome/browser/ui/startup/default_browser_infobar_delegate.h
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h
index daf5c85..c8a60e2 100644
--- a/chrome/browser/ui/startup/default_browser_infobar_delegate.h
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
-#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
+#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
#include "base/memory/raw_ptr.h"
#include "base/types/pass_key.h"
@@ -76,4 +76,4 @@
} // namespace chrome
-#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
+#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_INFOBAR_DELEGATE_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.cc
similarity index 90%
rename from chrome/browser/ui/startup/default_browser_prompt.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.cc
index 6cdd06ce..bbf8a594 100644
--- a/chrome/browser/ui/startup/default_browser_prompt.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
#include <limits>
#include <string>
@@ -22,10 +22,10 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/startup/default_browser_infobar_delegate.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_trial.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/pref_names.h"
@@ -45,8 +45,9 @@
// |browser| may be null in UI tests. Also, don't show the prompt in an app
// window, which is not meant to be treated as a Chrome window. Only show in
// a normal, tabbed browser.
- if (browser && !browser->is_type_normal())
+ if (browser && !browser->is_type_normal()) {
continue;
+ }
// In ChromeBot tests, there might be a race. This line appears to get
// called during shutdown and the active web contents can be nullptr.
@@ -115,8 +116,8 @@
} // namespace
void RegisterDefaultBrowserPromptPrefs(PrefRegistrySimple* registry) {
- registry->RegisterStringPref(
- prefs::kBrowserSuppressDefaultBrowserPrompt, std::string());
+ registry->RegisterStringPref(prefs::kBrowserSuppressDefaultBrowserPrompt,
+ std::string());
registry->RegisterStringPref(prefs::kDefaultBrowserPromptRefreshStudyGroup,
std::string());
}
@@ -166,7 +167,7 @@
// Do not check if Chrome is the default browser if there is a policy in
// control of this setting.
if (g_browser_process->local_state()->IsManagedPreference(
- prefs::kDefaultBrowserSettingEnabled)) {
+ prefs::kDefaultBrowserSettingEnabled)) {
// Handling of the browser.default_browser_setting_enabled policy setting is
// taken care of in BrowserProcessImpl.
return;
diff --git a/chrome/browser/ui/startup/default_browser_prompt.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h
similarity index 81%
rename from chrome/browser/ui/startup/default_browser_prompt.h
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h
index 5db05e4..3052882 100644
--- a/chrome/browser/ui/startup/default_browser_prompt.h
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_H_
-#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_H_
+#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_H_
+#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_H_
class PrefRegistrySimple;
class PrefService;
diff --git a/chrome/browser/ui/startup/default_browser_prompt_browsertest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc
similarity index 91%
rename from chrome/browser/ui/startup/default_browser_prompt_browsertest.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc
index aa1185d..6cf85ae 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_browsertest.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_browsertest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
#include "base/metrics/field_trial.h"
#include "base/strings/strcat.h"
#include "base/test/scoped_feature_list.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_trial.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -19,7 +19,7 @@
#include "testing/gtest/include/gtest/gtest.h"
class DefaultBrowserPromptBrowserTest : public InProcessBrowserTest {
- public:
+public:
static constexpr char kStudyTestGroupName[] = "test_group_1";
void SetUp() override {
@@ -35,9 +35,9 @@
{{}});
}
- PrefService* local_state() { return g_browser_process->local_state(); }
+ PrefService *local_state() { return g_browser_process->local_state(); }
- private:
+private:
base::test::ScopedFeatureList scoped_feature_list;
};
diff --git a/chrome/browser/ui/startup/default_browser_prompt_interactive_uitest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc
similarity index 92%
rename from chrome/browser/ui/startup/default_browser_prompt_interactive_uitest.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc
index b89e332..a0e0a298 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_interactive_uitest.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_interactive_uitest.cc
@@ -7,7 +7,7 @@
#include "base/test/scoped_feature_list.h"
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/ui/browser_element_identifiers.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/ui/toolbar/app_menu_model.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/ui/views/frame/app_menu_button.h"
@@ -27,11 +27,11 @@
namespace {
DEFINE_LOCAL_ELEMENT_IDENTIFIER_VALUE(kSecondTabContents);
-} // namespace
+} // namespace
class DefaultBrowserPromptInteractiveTest
: public WebUiInteractiveTestMixin<InteractiveBrowserTest> {
- public:
+public:
void SetUp() override {
scoped_feature_list_.InitAndEnableFeatureWithParameters(
features::kDefaultBrowserPromptRefresh,
@@ -43,10 +43,10 @@
InteractiveBrowserTest::SetUp();
}
- static base::OnceCallback<bool(AppMenuButton*)>
+ static base::OnceCallback<bool(AppMenuButton *)>
IsAppMenuChipDefaultBrowserPromptShowing(bool showing) {
return base::BindOnce(
- [](bool showing, AppMenuButton* app_menu_button) {
+ [](bool showing, AppMenuButton *app_menu_button) {
return showing == (app_menu_button->GetText() ==
l10n_util::GetStringUTF16(
IDS_APP_MENU_BUTTON_DEFAULT_PROMPT));
@@ -60,14 +60,14 @@
exists ? EnsurePresent(AppMenuModel::kSetBrowserAsDefaultMenuItem)
: EnsureNotPresent(AppMenuModel::kSetBrowserAsDefaultMenuItem),
WithView(kToolbarAppMenuButtonElementId,
- [](AppMenuButton* app_menu_button) {
+ [](AppMenuButton *app_menu_button) {
app_menu_button->CloseMenu();
}));
}
- InteractiveTestApi::MultiStep RemovesAllBrowserDefaultPromptsWhen(
- InteractiveTestApi::MultiStep steps,
- bool preserve_app_menu_item = false) {
+ InteractiveTestApi::MultiStep
+ RemovesAllBrowserDefaultPromptsWhen(InteractiveTestApi::MultiStep steps,
+ bool preserve_app_menu_item = false) {
return Steps(WaitForShow(ConfirmInfoBar::kInfoBarElementId), FlushEvents(),
WaitForShow(kToolbarAppMenuButtonElementId),
CheckView(kToolbarAppMenuButtonElementId,
@@ -85,7 +85,7 @@
DoesAppMenuItemExist(preserve_app_menu_item));
}
- private:
+private:
base::test::ScopedFeatureList scoped_feature_list_;
};
@@ -134,7 +134,7 @@
class DefaultBrowserPromptInteractiveTestWithAppMenuDuration
: public DefaultBrowserPromptInteractiveTest {
- public:
+public:
void SetUp() override {
scoped_feature_list_.InitAndEnableFeatureWithParameters(
features::kDefaultBrowserPromptRefresh,
@@ -146,7 +146,7 @@
InteractiveBrowserTest::SetUp();
}
- private:
+private:
base::test::ScopedFeatureList scoped_feature_list_;
};
diff --git a/chrome/browser/ui/startup/default_browser_prompt_manager.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc
similarity index 84%
rename from chrome/browser/ui/startup/default_browser_prompt_manager.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc
index ab1cd199..18de95d3 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_manager.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include <memory>
@@ -15,8 +15,8 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/startup/default_browser_infobar_delegate.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_infobar_delegate.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/pref_names.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
@@ -26,7 +26,7 @@
namespace {
bool ShouldShowPrompts() {
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
const int declined_count =
local_state->GetInteger(prefs::kDefaultBrowserDeclinedCount);
@@ -53,17 +53,17 @@
std::pow(features::kRepromptDurationMultiplier.Get(), declined_count - 1);
return (base::Time::Now() - last_declined_time) > reprompt_duration;
}
-} // namespace
+} // namespace
// static
-DefaultBrowserPromptManager* DefaultBrowserPromptManager::GetInstance() {
+DefaultBrowserPromptManager *DefaultBrowserPromptManager::GetInstance() {
return base::Singleton<DefaultBrowserPromptManager>::get();
}
-void DefaultBrowserPromptManager::AddObserver(Observer* observer) {
+void DefaultBrowserPromptManager::AddObserver(Observer *observer) {
observers_.AddObserver(observer);
}
-void DefaultBrowserPromptManager::RemoveObserver(Observer* observer) {
+void DefaultBrowserPromptManager::RemoveObserver(Observer *observer) {
observers_.RemoveObserver(observer);
}
@@ -111,18 +111,17 @@
DefaultBrowserPromptManager::~DefaultBrowserPromptManager() = default;
void DefaultBrowserPromptManager::CreateInfoBarForWebContents(
- content::WebContents* web_contents,
- Profile* profile) {
+ content::WebContents *web_contents, Profile *profile) {
// Ensure that an infobar hasn't already been created.
CHECK(!infobars_.contains(web_contents));
- infobars::InfoBar* infobar = chrome::DefaultBrowserInfoBarDelegate::Create(
+ infobars::InfoBar *infobar = chrome::DefaultBrowserInfoBarDelegate::Create(
infobars::ContentInfoBarManager::FromWebContents(web_contents), profile);
infobars_[web_contents] = infobar;
- static_cast<ConfirmInfoBarDelegate*>(infobar->delegate())->AddObserver(this);
+ static_cast<ConfirmInfoBarDelegate *>(infobar->delegate())->AddObserver(this);
- auto* infobar_manager =
+ auto *infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);
infobar_manager->AddObserver(this);
}
@@ -130,7 +129,7 @@
void DefaultBrowserPromptManager::CloseAllInfoBars() {
browser_tab_strip_tracker_.reset();
- for (const auto& infobars_entry : infobars_) {
+ for (const auto &infobars_entry : infobars_) {
infobars_entry.second->owner()->RemoveObserver(this);
infobars_entry.second->RemoveSelf();
}
@@ -144,7 +143,7 @@
}
if (show) {
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
base::TimeDelta app_menu_remaining_duration;
if (local_state->FindPreference(prefs::kDefaultBrowserFirstShownTime)
->IsDefaultValue()) {
@@ -176,7 +175,7 @@
}
show_app_menu_prompt_ = show;
- for (auto& obs : observers_) {
+ for (auto &obs : observers_) {
obs.OnShowAppMenuPromptChanged();
}
}
@@ -185,18 +184,17 @@
show_app_menu_item_ = show;
}
-bool DefaultBrowserPromptManager::ShouldTrackBrowser(Browser* browser) {
+bool DefaultBrowserPromptManager::ShouldTrackBrowser(Browser *browser) {
return browser->is_type_normal() &&
!browser->profile()->IsIncognitoProfile() &&
!browser->profile()->IsGuestSession();
}
void DefaultBrowserPromptManager::OnTabStripModelChanged(
- TabStripModel* tab_strip_model,
- const TabStripModelChange& change,
- const TabStripSelectionChange& selection) {
+ TabStripModel *tab_strip_model, const TabStripModelChange &change,
+ const TabStripSelectionChange &selection) {
if (change.type() == TabStripModelChange::kInserted) {
- for (const auto& contents : change.GetInsert()->contents) {
+ for (const auto &contents : change.GetInsert()->contents) {
if (!base::Contains(infobars_, contents.contents)) {
CreateInfoBarForWebContents(contents.contents,
tab_strip_model->profile());
@@ -205,7 +203,7 @@
}
}
-void DefaultBrowserPromptManager::OnInfoBarRemoved(infobars::InfoBar* infobar,
+void DefaultBrowserPromptManager::OnInfoBarRemoved(infobars::InfoBar *infobar,
bool animate) {
auto infobars_entry = base::ranges::find(
infobars_, infobar, &decltype(infobars_)::value_type::second);
@@ -215,7 +213,7 @@
infobar->owner()->RemoveObserver(this);
infobars_.erase(infobars_entry);
- static_cast<ConfirmInfoBarDelegate*>(infobar->delegate())
+ static_cast<ConfirmInfoBarDelegate *>(infobar->delegate())
->RemoveObserver(this);
if (user_initiated_info_bar_close_pending_.has_value()) {
diff --git a/chrome/browser/ui/startup/default_browser_prompt_manager.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h
similarity index 91%
rename from chrome/browser/ui/startup/default_browser_prompt_manager.h
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h
index 0f77dd2..b6890c0 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_manager.h
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_MANAGER_H_
-#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_MANAGER_H_
+#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_MANAGER_H_
+#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_MANAGER_H_
#include <map>
@@ -97,4 +97,4 @@
base::OneShotTimer app_menu_prompt_dismiss_timer_;
};
-#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_MANAGER_H_
+#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_MANAGER_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt_manager_unittest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc
similarity index 92%
rename from chrome/browser/ui/startup/default_browser_prompt_manager_unittest.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc
index deae7cd..5309b25 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_manager_unittest.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include <map>
#include "base/test/scoped_feature_list.h"
#include "base/time/time.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/browser_with_test_window_test.h"
@@ -24,23 +24,23 @@
namespace {
class DefaultBrowserPromptManagerObserver
: public DefaultBrowserPromptManager::Observer {
- public:
+public:
MOCK_METHOD(void, OnShowAppMenuPromptChanged, (), (override));
};
class InfoBarManagerObserver : public infobars::InfoBarManager::Observer {
- public:
+public:
MOCK_METHOD(void, OnInfoBarAdded, (infobars::InfoBar * infobar), (override));
};
-} // namespace
+} // namespace
class DefaultBrowserPromptManagerTest : public BrowserWithTestWindowTest {
- public:
+public:
DefaultBrowserPromptManagerTest()
: BrowserWithTestWindowTest(
base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
- protected:
+protected:
void SetUp() override {
BrowserWithTestWindowTest::SetUp();
@@ -55,9 +55,7 @@
browser()->tab_strip_model()->AppendWebContents(std::move(contents), true);
}
- void TearDown() override {
- BrowserWithTestWindowTest::TearDown();
- }
+ void TearDown() override { BrowserWithTestWindowTest::TearDown(); }
void EnableDefaultBrowserPromptRefreshFeatureWithParams(
std::map<std::string, std::string> params) {
@@ -68,12 +66,11 @@
void TestShouldShowInfoBarPrompt(
std::optional<base::TimeDelta> last_declined_time_delta,
- std::optional<int> declined_count,
- bool expect_infobar_exists) {
+ std::optional<int> declined_count, bool expect_infobar_exists) {
if (last_declined_time_delta.has_value()) {
- local_state()->SetTime(
- prefs::kDefaultBrowserLastDeclinedTime,
- base::Time::Now() - last_declined_time_delta.value());
+ local_state()->SetTime(prefs::kDefaultBrowserLastDeclinedTime,
+ base::Time::Now() -
+ last_declined_time_delta.value());
} else {
local_state()->ClearPref(prefs::kDefaultBrowserLastDeclinedTime);
}
@@ -87,7 +84,7 @@
manager()->CloseAllPrompts(
DefaultBrowserPromptManager::CloseReason::kAccept);
- infobars::ContentInfoBarManager* infobar_manager =
+ infobars::ContentInfoBarManager *infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(
browser()->tab_strip_model()->GetWebContentsAt(0));
infobar_observation_.Observe(infobar_manager);
@@ -99,11 +96,11 @@
infobar_observation_.Reset();
}
- PrefService* local_state() { return g_browser_process->local_state(); }
+ PrefService *local_state() { return g_browser_process->local_state(); }
- DefaultBrowserPromptManager* manager() { return manager_; }
+ DefaultBrowserPromptManager *manager() { return manager_; }
- private:
+private:
raw_ptr<DefaultBrowserPromptManager> manager_;
base::test::ScopedFeatureList scoped_feature_list_;
@@ -142,7 +139,7 @@
EnableDefaultBrowserPromptRefreshFeatureWithParams(
{{features::kShowDefaultBrowserAppMenuItem.name, "true"}});
- auto* manager = DefaultBrowserPromptManager::GetInstance();
+ auto *manager = DefaultBrowserPromptManager::GetInstance();
ASSERT_FALSE(manager->get_show_app_menu_item());
manager->MaybeShowPrompt();
@@ -153,7 +150,7 @@
EnableDefaultBrowserPromptRefreshFeatureWithParams(
{{features::kShowDefaultBrowserAppMenuItem.name, "false"}});
- auto* manager = DefaultBrowserPromptManager::GetInstance();
+ auto *manager = DefaultBrowserPromptManager::GetInstance();
ASSERT_FALSE(manager->get_show_app_menu_item());
manager->MaybeShowPrompt();
@@ -164,7 +161,7 @@
EnableDefaultBrowserPromptRefreshFeatureWithParams(
{{features::kShowDefaultBrowserAppMenuItem.name, "true"}});
- auto* manager = DefaultBrowserPromptManager::GetInstance();
+ auto *manager = DefaultBrowserPromptManager::GetInstance();
manager->MaybeShowPrompt();
ASSERT_TRUE(manager->get_show_app_menu_item());
@@ -176,7 +173,7 @@
EnableDefaultBrowserPromptRefreshFeatureWithParams(
{{features::kShowDefaultBrowserAppMenuItem.name, "true"}});
- auto* manager = DefaultBrowserPromptManager::GetInstance();
+ auto *manager = DefaultBrowserPromptManager::GetInstance();
manager->MaybeShowPrompt();
ASSERT_TRUE(manager->get_show_app_menu_item());
@@ -375,9 +372,9 @@
{features::kRepromptDuration.name, "1d"}});
local_state()->SetTime(prefs::kDefaultBrowserFirstShownTime,
base::Time::Now() - base::Seconds(1));
- local_state()->SetTime(
- prefs::kDefaultBrowserLastDeclinedTime,
- base::Time::Now() - base::Days(1) - base::Microseconds(1));
+ local_state()->SetTime(prefs::kDefaultBrowserLastDeclinedTime,
+ base::Time::Now() - base::Days(1) -
+ base::Microseconds(1));
local_state()->SetInteger(prefs::kDefaultBrowserDeclinedCount, 1);
chrome::startup::default_prompt::MaybeResetAppMenuPromptPrefs(profile());
manager()->MaybeShowPrompt();
diff --git a/chrome/browser/ui/startup/default_browser_prompt_prefs.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc
similarity index 81%
rename from chrome/browser/ui/startup/default_browser_prompt_prefs.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc
index c586334..6373f29d 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_prefs.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/ui/ui_features.h"
@@ -11,8 +11,8 @@
namespace {
bool ShouldShowAppMenuPrompt() {
- PrefService* local_state = g_browser_process->local_state();
- const PrefService::Preference* first_shown_time_pref =
+ PrefService *local_state = g_browser_process->local_state();
+ const PrefService::Preference *first_shown_time_pref =
local_state->FindPreference(prefs::kDefaultBrowserFirstShownTime);
base::Time first_shown_time =
local_state->GetTime(prefs::kDefaultBrowserFirstShownTime);
@@ -21,24 +21,24 @@
(base::Time::Now() - first_shown_time) <
features::kDefaultBrowserAppMenuDuration.Get();
}
-} // namespace
+} // namespace
-void chrome::startup::default_prompt::ResetPromptPrefs(Profile* profile) {
+void chrome::startup::default_prompt::ResetPromptPrefs(Profile *profile) {
profile->GetPrefs()->ClearPref(prefs::kDefaultBrowserLastDeclined);
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
local_state->ClearPref(prefs::kDefaultBrowserLastDeclinedTime);
local_state->ClearPref(prefs::kDefaultBrowserDeclinedCount);
local_state->ClearPref(prefs::kDefaultBrowserFirstShownTime);
}
void chrome::startup::default_prompt::UpdatePrefsForDismissedPrompt(
- Profile* profile) {
+ Profile *profile) {
base::Time now = base::Time::Now();
profile->GetPrefs()->SetInt64(prefs::kDefaultBrowserLastDeclined,
now.ToInternalValue());
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
local_state->SetTime(prefs::kDefaultBrowserLastDeclinedTime, now);
local_state->SetInteger(
prefs::kDefaultBrowserDeclinedCount,
@@ -47,7 +47,7 @@
}
void chrome::startup::default_prompt::MaybeResetAppMenuPromptPrefs(
- Profile* profile) {
+ Profile *profile) {
if (!base::FeatureList::IsEnabled(features::kDefaultBrowserPromptRefresh) ||
!features::kShowDefaultBrowserAppMenuChip.Get()) {
g_browser_process->local_state()->ClearPref(
diff --git a/chrome/browser/ui/startup/default_browser_prompt_prefs.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h
similarity index 77%
rename from chrome/browser/ui/startup/default_browser_prompt_prefs.h
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h
index 195b816..2c402dc9 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_prefs.h
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PREFS_H_
-#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PREFS_H_
+#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_PREFS_H_
+#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_PREFS_H_
#include "chrome/browser/profiles/profile.h"
@@ -25,4 +25,4 @@
} // namespace chrome::startup::default_prompt
-#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_PREFS_H_
+#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_PREFS_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt_trial.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc
similarity index 82%
rename from chrome/browser/ui/startup/default_browser_prompt_trial.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc
index 8ceefcbe..50d12fb 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_trial.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt_trial.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
@@ -12,9 +12,9 @@
// static
void DefaultBrowserPromptTrial::MaybeJoinDefaultBrowserPromptCohort() {
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
if (!local_state) {
- return; // Can be null in unit tests;
+ return; // Can be null in unit tests;
}
std::string active_study_group =
@@ -31,9 +31,9 @@
// static
void DefaultBrowserPromptTrial::EnsureStickToDefaultBrowserPromptCohort() {
- PrefService* local_state = g_browser_process->local_state();
+ PrefService *local_state = g_browser_process->local_state();
if (!local_state) {
- return; // Can be null in unit tests;
+ return; // Can be null in unit tests;
}
auto enrolled_study_group =
@@ -48,7 +48,7 @@
// static
void DefaultBrowserPromptTrial::RegisterSyntheticFieldTrial(
- const std::string& group_name) {
+ const std::string &group_name) {
CHECK(!group_name.empty());
ChromeMetricsServiceAccessor::RegisterSyntheticFieldTrial(
diff --git a/chrome/browser/ui/startup/default_browser_prompt_trial.h b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h
similarity index 81%
rename from chrome/browser/ui/startup/default_browser_prompt_trial.h
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h
index f7fc297..2c86b360 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_trial.h
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_trial.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_TRIAL_H_
-#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_TRIAL_H_
+#ifndef CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_TRIAL_H_
+#define CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_TRIAL_H_
#include <string>
@@ -31,4 +31,4 @@
static void RegisterSyntheticFieldTrial(const std::string& group_name);
};
-#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_TRIAL_H_
+#endif // CHROME_BROWSER_UI_STARTUP_DEFAULT_BROWSER_PROMPT_DEFAULT_BROWSER_PROMPT_TRIAL_H_
diff --git a/chrome/browser/ui/startup/default_browser_prompt_unittest.cc b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc
similarity index 91%
rename from chrome/browser/ui/startup/default_browser_prompt_unittest.cc
rename to chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc
index 95133e0b..ad1f3005 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_unittest.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
#include <memory>
@@ -16,7 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
class DefaultBrowserPromptTest : public testing::Test {
- protected:
+protected:
void SetUp() override {
testing_profile_manager = std::make_unique<TestingProfileManager>(
TestingBrowserProcess::GetGlobal());
@@ -25,13 +25,13 @@
testing_profile_manager->CreateTestingProfile("Test Profile");
}
- PrefService* profile_prefs() { return testing_profile->GetPrefs(); }
+ PrefService *profile_prefs() { return testing_profile->GetPrefs(); }
- Profile* profile() { return testing_profile; }
+ Profile *profile() { return testing_profile; }
- PrefService* local_state() { return g_browser_process->local_state(); }
+ PrefService *local_state() { return g_browser_process->local_state(); }
- private:
+private:
content::BrowserTaskEnvironment task_environment_{
base::test::TaskEnvironment::TimeSource::MOCK_TIME};
std::unique_ptr<TestingProfileManager> testing_profile_manager;
diff --git a/chrome/browser/ui/startup/infobar_utils.cc b/chrome/browser/ui/startup/infobar_utils.cc
index 6761b538..d3ad537 100644
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -30,7 +30,7 @@
#include "services/network/public/cpp/network_switches.h"
#if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
#endif
#if BUILDFLAG(CHROME_FOR_TESTING)
diff --git a/chrome/browser/ui/toolbar/app_menu_icon_controller.cc b/chrome/browser/ui/toolbar/app_menu_icon_controller.cc
index a31c2fb5..9a39636 100644
--- a/chrome/browser/ui/toolbar/app_menu_icon_controller.cc
+++ b/chrome/browser/ui/toolbar/app_menu_icon_controller.cc
@@ -10,7 +10,7 @@
#include "chrome/app/vector_icons/vector_icons.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/ui/ui_features.h"
#include "chrome/browser/upgrade_detector/upgrade_detector.h"
#include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ui/toolbar/app_menu_icon_controller.h b/chrome/browser/ui/toolbar/app_menu_icon_controller.h
index 8270b5e..6f63138e 100644
--- a/chrome/browser/ui/toolbar/app_menu_icon_controller.h
+++ b/chrome/browser/ui/toolbar/app_menu_icon_controller.h
@@ -14,7 +14,7 @@
#include "build/build_config.h"
#include "chrome/browser/ui/global_error/global_error_observer.h"
#include "chrome/browser/ui/global_error/global_error_service.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/upgrade_detector/upgrade_observer.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/base/models/image_model.h"
diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
index ee8f71cd..b11b01c 100644
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -55,7 +55,7 @@
#include "chrome/browser/ui/safety_hub/menu_notification_service_factory.h"
#include "chrome/browser/ui/safety_hub/safety_hub_constants.h"
#include "chrome/browser/ui/side_panel/companion/companion_utils.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/ui/tabs/organization/tab_organization_service_factory.h"
#include "chrome/browser/ui/tabs/organization/tab_organization_utils.h"
#include "chrome/browser/ui/tabs/recent_tabs_sub_menu_model.h"
diff --git a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
index 1fd9845..c3cbb5c 100644
--- a/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model_unittest.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/ui/safety_hub/password_status_check_service.h"
#include "chrome/browser/ui/safety_hub/password_status_check_service_factory.h"
#include "chrome/browser/ui/safety_hub/safety_hub_test_util.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/ui/tabs/organization/tab_organization_utils.h"
#include "chrome/browser/ui/tabs/recent_tabs_sub_menu_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/views/infobars/default_browser_infobar_interactive_uitest.cc b/chrome/browser/ui/views/infobars/default_browser_infobar_interactive_uitest.cc
index c44a3c5..90dcde8 100644
--- a/chrome/browser/ui/views/infobars/default_browser_infobar_interactive_uitest.cc
+++ b/chrome/browser/ui/views/infobars/default_browser_infobar_interactive_uitest.cc
@@ -16,8 +16,8 @@
#include "chrome/browser/ui/accelerator_utils.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_element_identifiers.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
#include "chrome/browser/ui/startup/infobar_utils.h"
#include "chrome/browser/ui/toolbar/app_menu_model.h"
#include "chrome/browser/ui/ui_features.h"
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
index 64596b2..73b4d882 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -9,9 +9,9 @@
#include "base/metrics/user_metrics.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_manager.h"
-#include "chrome/browser/ui/startup/default_browser_prompt_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_manager.h"
+#include "chrome/browser/ui/startup/default_browser_prompt/default_browser_prompt_prefs.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/web_ui.h"
