diff --git a/browser/speedreader/speedreader_browsertest.cc b/browser/speedreader/speedreader_browsertest.cc index 75eed9157ca..6bd9a1cfd8b 100644 --- a/browser/speedreader/speedreader_browsertest.cc +++ b/browser/speedreader/speedreader_browsertest.cc @@ -27,7 +27,7 @@ class SpeedReaderBrowserTest : public InProcessBrowserTest { public: SpeedReaderBrowserTest() : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) { - feature_list_.InitAndEnableFeature(speedreader::kBraveSpeedreader); + feature_list_.InitAndEnableFeature(speedreader::kSpeedreaderFeature); brave::RegisterPathProvider(); base::FilePath test_data_dir; base::PathService::Get(brave::DIR_TEST_DATA, &test_data_dir); diff --git a/browser/ui/views/toolbar/brave_toolbar_view.cc b/browser/ui/views/toolbar/brave_toolbar_view.cc index 0291f3edc08..b31f236bcb6 100644 --- a/browser/ui/views/toolbar/brave_toolbar_view.cc +++ b/browser/ui/views/toolbar/brave_toolbar_view.cc @@ -135,7 +135,7 @@ void BraveToolbarView::Init() { bookmark_->Init(); // Speedreader. - if (base::FeatureList::IsEnabled(speedreader::kBraveSpeedreader)) { + if (base::FeatureList::IsEnabled(speedreader::kSpeedreaderFeature)) { speedreader_ = new SpeedreaderButton(this, profile->GetPrefs()); speedreader_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON); diff --git a/browser/ui/views/toolbar/speedreader_button.cc b/browser/ui/views/toolbar/speedreader_button.cc index 725dbcab201..0d22fc0460b 100644 --- a/browser/ui/views/toolbar/speedreader_button.cc +++ b/browser/ui/views/toolbar/speedreader_button.cc @@ -30,10 +30,10 @@ SpeedreaderButton::SpeedreaderButton(views::ButtonListener* listener, set_tag(IDC_TOGGLE_SPEEDREADER); SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FORWARD)); - on_ = prefs_->GetBoolean(speedreader::kSpeedreaderEnabled); + on_ = prefs_->GetBoolean(speedreader::kSpeedreaderPrefEnabled); pref_change_registrar_.Init(prefs_); pref_change_registrar_.Add( - speedreader::kSpeedreaderEnabled, + speedreader::kSpeedreaderPrefEnabled, base::BindRepeating(&SpeedreaderButton::OnPreferenceChanged, base::Unretained(this))); } @@ -64,7 +64,7 @@ void SpeedreaderButton::SetHighlighted(bool bubble_visible) { } void SpeedreaderButton::OnPreferenceChanged() { - on_ = prefs_->GetBoolean(speedreader::kSpeedreaderEnabled); + on_ = prefs_->GetBoolean(speedreader::kSpeedreaderPrefEnabled); UpdateImage(); } diff --git a/chromium_src/chrome/browser/about_flags.cc b/chromium_src/chrome/browser/about_flags.cc index d7f8a6cccac..1cbbae8c01c 100644 --- a/chromium_src/chrome/browser/about_flags.cc +++ b/chromium_src/chrome/browser/about_flags.cc @@ -21,6 +21,7 @@ using brave_sync::features::kBraveSync; using ntp_background_images::features::kBraveNTPBrandedWallpaper; using ntp_background_images::features::kBraveNTPBrandedWallpaperDemo; using ntp_background_images::features::kBraveNTPSuperReferralWallpaper; +using speedreader::kSpeedreaderFeature; #define BRAVE_FEATURE_ENTRIES \ {"use-dev-updater-url", \ @@ -42,7 +43,7 @@ using ntp_background_images::features::kBraveNTPSuperReferralWallpaper; {"brave-speedreader", \ flag_descriptions::kBraveSpeedreaderName, \ flag_descriptions::kBraveSpeedreaderDescription, kOsDesktop, \ - FEATURE_VALUE_TYPE(speedreader::kBraveSpeedreader)}, \ + FEATURE_VALUE_TYPE(kSpeedreaderFeature)}, \ {"brave-sync", \ flag_descriptions::kBraveSyncName, \ flag_descriptions::kBraveSyncDescription, kOsDesktop, \ diff --git a/components/speedreader/features.cc b/components/speedreader/features.cc index 30f34a7902e..ed8565ee602 100644 --- a/components/speedreader/features.cc +++ b/components/speedreader/features.cc @@ -9,8 +9,7 @@ namespace speedreader { -const base::Feature kBraveSpeedreader{ - "Speedreader", - base::FEATURE_DISABLED_BY_DEFAULT}; +const base::Feature kSpeedreaderFeature{"Speedreader", + base::FEATURE_DISABLED_BY_DEFAULT}; } // namespace speedreader diff --git a/components/speedreader/features.h b/components/speedreader/features.h index b864ab598cc..66a241cbd47 100644 --- a/components/speedreader/features.h +++ b/components/speedreader/features.h @@ -11,7 +11,7 @@ struct Feature; } // namespace base namespace speedreader { -extern const base::Feature kBraveSpeedreader; +extern const base::Feature kSpeedreaderFeature; } // namespace speedreader #endif // BRAVE_COMPONENTS_SPEEDREADER_FEATURES_H_ diff --git a/components/speedreader/speedreader_pref_names.h b/components/speedreader/speedreader_pref_names.h index a5544c5bb46..7d59789728b 100644 --- a/components/speedreader/speedreader_pref_names.h +++ b/components/speedreader/speedreader_pref_names.h @@ -8,7 +8,7 @@ namespace speedreader { -constexpr char kSpeedreaderEnabled[] = "brave.speedreader.enabled"; +constexpr char kSpeedreaderPrefEnabled[] = "brave.speedreader.enabled"; } // namespace speedreader diff --git a/components/speedreader/speedreader_service.cc b/components/speedreader/speedreader_service.cc index a2a76e307c6..ae1cf763228 100644 --- a/components/speedreader/speedreader_service.cc +++ b/components/speedreader/speedreader_service.cc @@ -19,20 +19,20 @@ SpeedreaderService::~SpeedreaderService() {} // static void SpeedreaderService::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterBooleanPref(kSpeedreaderEnabled, false); + registry->RegisterBooleanPref(kSpeedreaderPrefEnabled, false); } void SpeedreaderService::ToggleSpeedreader() { - const bool enabled = prefs_->GetBoolean(kSpeedreaderEnabled); - prefs_->SetBoolean(kSpeedreaderEnabled, !enabled); + const bool enabled = prefs_->GetBoolean(kSpeedreaderPrefEnabled); + prefs_->SetBoolean(kSpeedreaderPrefEnabled, !enabled); } bool SpeedreaderService::IsEnabled() { - if (!base::FeatureList::IsEnabled(kBraveSpeedreader)) { + if (!base::FeatureList::IsEnabled(kSpeedreaderFeature)) { return false; } - return prefs_->GetBoolean(kSpeedreaderEnabled); + return prefs_->GetBoolean(kSpeedreaderPrefEnabled); } } // namespace speedreader