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

Side by Side Diff: chrome/browser/ui/toolbar/media_router_action_controller.cc

Issue 2176613003: [Media Router] Clean up issues related code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years 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
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 #include "chrome/browser/ui/toolbar/media_router_action_controller.h" 5 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
6 6
7 #include "chrome/browser/media/router/media_router_factory.h" 7 #include "chrome/browser/media/router/media_router_factory.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" 9 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
10 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" 10 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 12
13 MediaRouterActionController::MediaRouterActionController(Profile* profile) 13 MediaRouterActionController::MediaRouterActionController(Profile* profile)
14 : MediaRouterActionController( 14 : MediaRouterActionController(
15 profile, 15 profile,
16 media_router::MediaRouterFactory::GetApiForBrowserContext(profile), 16 media_router::MediaRouterFactory::GetApiForBrowserContext(profile),
17 ToolbarActionsModel::Get(profile), 17 ToolbarActionsModel::Get(profile),
18 ToolbarActionsModel::Get(profile)->component_migration_helper()) { 18 ToolbarActionsModel::Get(profile)->component_migration_helper()) {
19 DCHECK(component_action_delegate_); 19 DCHECK(component_action_delegate_);
20 DCHECK(component_migration_helper_); 20 DCHECK(component_migration_helper_);
21 } 21 }
22 22
23 MediaRouterActionController::~MediaRouterActionController() { 23 MediaRouterActionController::~MediaRouterActionController() {
24 DCHECK_EQ(dialog_count_, 0u); 24 DCHECK_EQ(dialog_count_, 0u);
25 UnregisterObserver(); // media_router::IssuesObserver.
26 } 25 }
27 26
28 void MediaRouterActionController::OnIssueUpdated( 27 void MediaRouterActionController::OnIssue(const media_router::Issue& issue) {
29 const media_router::Issue* issue) { 28 has_issue_ = true;
30 has_issue_ = issue != nullptr;
31 MaybeAddOrRemoveAction(); 29 MaybeAddOrRemoveAction();
32 } 30 }
33 31
32 void MediaRouterActionController::OnIssuesCleared() {
33 has_issue_ = false;
34 MaybeAddOrRemoveAction();
35 }
36
34 void MediaRouterActionController::OnRoutesUpdated( 37 void MediaRouterActionController::OnRoutesUpdated(
35 const std::vector<media_router::MediaRoute>& routes, 38 const std::vector<media_router::MediaRoute>& routes,
36 const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) { 39 const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
37 has_local_display_route_ = 40 has_local_display_route_ =
38 std::find_if(routes.begin(), routes.end(), 41 std::find_if(routes.begin(), routes.end(),
39 [](const media_router::MediaRoute& route) { 42 [](const media_router::MediaRoute& route) {
40 return route.is_local() && route.for_display(); 43 return route.is_local() && route.for_display();
41 }) != routes.end(); 44 }) != routes.end();
42 45
43 MaybeAddOrRemoveAction(); 46 MaybeAddOrRemoveAction();
(...skipping 16 matching lines...) Expand all
60 media_router::MediaRouter* router, 63 media_router::MediaRouter* router,
61 extensions::ComponentMigrationHelper::ComponentActionDelegate* 64 extensions::ComponentMigrationHelper::ComponentActionDelegate*
62 component_action_delegate, 65 component_action_delegate,
63 extensions::ComponentMigrationHelper* component_migration_helper) 66 extensions::ComponentMigrationHelper* component_migration_helper)
64 : media_router::IssuesObserver(router), 67 : media_router::IssuesObserver(router),
65 media_router::MediaRoutesObserver(router), 68 media_router::MediaRoutesObserver(router),
66 profile_(profile), 69 profile_(profile),
67 component_action_delegate_(component_action_delegate), 70 component_action_delegate_(component_action_delegate),
68 component_migration_helper_(component_migration_helper) { 71 component_migration_helper_(component_migration_helper) {
69 DCHECK(profile_); 72 DCHECK(profile_);
70 RegisterObserver(); // media_router::IssuesObserver. 73 media_router::IssuesObserver::Init();
71 pref_change_registrar_.Init(profile->GetPrefs()); 74 pref_change_registrar_.Init(profile->GetPrefs());
72 pref_change_registrar_.Add( 75 pref_change_registrar_.Add(
73 prefs::kToolbarMigratedComponentActionStatus, 76 prefs::kToolbarMigratedComponentActionStatus,
74 base::Bind(&MediaRouterActionController::MaybeAddOrRemoveAction, 77 base::Bind(&MediaRouterActionController::MaybeAddOrRemoveAction,
75 base::Unretained(this))); 78 base::Unretained(this)));
76 } 79 }
77 80
78 void MediaRouterActionController::MaybeAddOrRemoveAction() { 81 void MediaRouterActionController::MaybeAddOrRemoveAction() {
79 if (ShouldEnableAction()) { 82 if (ShouldEnableAction()) {
80 if (!component_action_delegate_->HasComponentAction( 83 if (!component_action_delegate_->HasComponentAction(
81 ComponentToolbarActionsFactory::kMediaRouterActionId)) { 84 ComponentToolbarActionsFactory::kMediaRouterActionId)) {
82 component_action_delegate_->AddComponentAction( 85 component_action_delegate_->AddComponentAction(
83 ComponentToolbarActionsFactory::kMediaRouterActionId); 86 ComponentToolbarActionsFactory::kMediaRouterActionId);
84 } 87 }
85 } else if (component_action_delegate_->HasComponentAction( 88 } else if (component_action_delegate_->HasComponentAction(
86 ComponentToolbarActionsFactory::kMediaRouterActionId)) { 89 ComponentToolbarActionsFactory::kMediaRouterActionId)) {
87 component_action_delegate_->RemoveComponentAction( 90 component_action_delegate_->RemoveComponentAction(
88 ComponentToolbarActionsFactory::kMediaRouterActionId); 91 ComponentToolbarActionsFactory::kMediaRouterActionId);
89 } 92 }
90 } 93 }
91 94
92 bool MediaRouterActionController::ShouldEnableAction() const { 95 bool MediaRouterActionController::ShouldEnableAction() const {
93 return has_local_display_route_ || has_issue_ || dialog_count_ || 96 return has_local_display_route_ || has_issue_ || dialog_count_ ||
94 component_migration_helper_->GetComponentActionPref( 97 component_migration_helper_->GetComponentActionPref(
95 ComponentToolbarActionsFactory::kMediaRouterActionId); 98 ComponentToolbarActionsFactory::kMediaRouterActionId);
96 } 99 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698