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

Unified Diff: chrome/browser/ui/toolbar/media_router_action_controller.cc

Issue 2678083005: Remove extension-to-component migration mechanism (Closed)
Patch Set: Address Derek's 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/toolbar/media_router_action_controller.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller.cc b/chrome/browser/ui/toolbar/media_router_action_controller.cc
index feaca76ae1ce1f77153f754afa67e993c18cd72e..b07b75b9631bc07d4bb6d2dceea2184f3677217d 100644
--- a/chrome/browser/ui/toolbar/media_router_action_controller.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_controller.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/media/router/media_router_factory.h"
#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/toolbar/component_action_delegate.h"
#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
#include "chrome/common/pref_names.h"
@@ -14,10 +15,8 @@ MediaRouterActionController::MediaRouterActionController(Profile* profile)
: MediaRouterActionController(
profile,
media_router::MediaRouterFactory::GetApiForBrowserContext(profile),
- ToolbarActionsModel::Get(profile),
- ToolbarActionsModel::Get(profile)->component_migration_helper()) {
+ ToolbarActionsModel::Get(profile)) {
DCHECK(component_action_delegate_);
- DCHECK(component_migration_helper_);
}
MediaRouterActionController::~MediaRouterActionController() {
@@ -35,6 +34,19 @@ bool MediaRouterActionController::IsActionShownByPolicy(Profile* profile) {
return show;
}
+// static
+bool MediaRouterActionController::GetAlwaysShowActionPref(Profile* profile) {
+ CHECK(profile);
+ return profile->GetPrefs()->GetBoolean(prefs::kShowCastIconInToolbar);
+}
+
+// static
+void MediaRouterActionController::SetAlwaysShowActionPref(Profile* profile,
+ bool always_show) {
+ CHECK(profile);
+ profile->GetPrefs()->SetBoolean(prefs::kShowCastIconInToolbar, always_show);
+}
+
void MediaRouterActionController::OnIssue(const media_router::Issue& issue) {
has_issue_ = true;
MaybeAddOrRemoveAction();
@@ -72,21 +84,18 @@ void MediaRouterActionController::OnDialogHidden() {
MediaRouterActionController::MediaRouterActionController(
Profile* profile,
media_router::MediaRouter* router,
- extensions::ComponentMigrationHelper::ComponentActionDelegate*
- component_action_delegate,
- extensions::ComponentMigrationHelper* component_migration_helper)
+ ComponentActionDelegate* component_action_delegate)
: media_router::IssuesObserver(router),
media_router::MediaRoutesObserver(router),
profile_(profile),
component_action_delegate_(component_action_delegate),
- component_migration_helper_(component_migration_helper),
shown_by_policy_(
MediaRouterActionController::IsActionShownByPolicy(profile)) {
CHECK(profile_);
media_router::IssuesObserver::Init();
pref_change_registrar_.Init(profile->GetPrefs());
pref_change_registrar_.Add(
- prefs::kToolbarMigratedComponentActionStatus,
+ prefs::kShowCastIconInToolbar,
base::Bind(&MediaRouterActionController::MaybeAddOrRemoveAction,
base::Unretained(this)));
}
@@ -107,7 +116,5 @@ void MediaRouterActionController::MaybeAddOrRemoveAction() {
bool MediaRouterActionController::ShouldEnableAction() const {
return shown_by_policy_ || has_local_display_route_ || has_issue_ ||
- dialog_count_ ||
- component_migration_helper_->GetComponentActionPref(
- ComponentToolbarActionsFactory::kMediaRouterActionId);
+ dialog_count_ || GetAlwaysShowActionPref(profile_);
}

Powered by Google App Engine
This is Rietveld 408576698