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

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 2760403003: Remove enable_media_router. (Closed)
Patch Set: Created 3 years, 9 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/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 4a6504deb9387bcc47c3bae97c614fbfa5349988..c726832d02884f1f5071f89306ba4279f986ecc4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -134,13 +134,11 @@
#include "chrome/browser/extensions/extension_web_ui.h"
#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/signin/easy_unlock_service.h"
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
#include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
#include "extensions/browser/api/runtime/runtime_api.h"
#include "extensions/browser/extension_prefs.h"
-#if defined(ENABLE_MEDIA_ROUTER)
-#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
-#endif // defined(ENABLE_MEDIA_ROUTER)
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
#if BUILDFLAG(ENABLE_PLUGINS)
@@ -761,7 +759,6 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
// - MediaRouterUIBrowserTest.MigrateToolbarIconShownPref
// - MediaRouterUIBrowserTest.MigrateToolbarIconUnshownPref
{
-#if defined(ENABLE_MEDIA_ROUTER)
bool show_cast_icon = false;
const base::DictionaryValue* action_migration_dict =
profile_prefs->GetDictionary(kToolbarMigratedComponentActionStatus);
@@ -771,7 +768,6 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
&show_cast_icon)) {
profile_prefs->SetBoolean(prefs::kShowCastIconInToolbar, show_cast_icon);
}
-#endif // defined(ENABLE_MEDIA_ROUTER)
profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
}
#endif // BUILDFLAG(ENABLE_EXTENSIONS)

Powered by Google App Engine
This is Rietveld 408576698