OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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.h" | 5 #include "chrome/browser/ui/toolbar/media_router_action.h" |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/media/router/issue.h" | 8 #include "chrome/browser/media/router/issue.h" |
9 #include "chrome/browser/media/router/media_route.h" | 9 #include "chrome/browser/media/router/media_route.h" |
10 #include "chrome/browser/media/router/media_router.h" | 10 #include "chrome/browser/media/router/media_router.h" |
11 #include "chrome/browser/media/router/media_router_factory.h" | 11 #include "chrome/browser/media/router/media_router_factory.h" |
12 #include "chrome/browser/media/router/media_router_mojo_impl.h" | 12 #include "chrome/browser/media/router/media_router_mojo_impl.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" | 16 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" |
17 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h" | 17 #include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h" |
18 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" | 18 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" |
19 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" | 19 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" |
20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" |
21 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
24 #include "ui/gfx/image/image_skia.h" | 24 #include "ui/gfx/image/image_skia.h" |
25 | 25 |
26 using media_router::MediaRouterDialogControllerImpl; | 26 using media_router::MediaRouterDialogControllerImpl; |
27 | 27 |
28 namespace { | |
29 | |
30 media_router::MediaRouter* GetMediaRouter(Browser* browser) { | |
31 return media_router::MediaRouterFactory::GetApiForBrowserContext( | |
32 browser->profile()); | |
Peter Kasting
2015/10/02 19:04:01
This is very simple and only used in one place, so
apacible
2015/10/02 20:45:48
This is used three times; I'd rather keep GetMedia
Peter Kasting
2015/10/05 03:20:26
Oh, sorry. Since the function looked added I had
| |
33 } | |
34 | |
35 } // namespace | |
36 | |
28 MediaRouterAction::MediaRouterAction(Browser* browser) | 37 MediaRouterAction::MediaRouterAction(Browser* browser) |
29 : media_router::IssuesObserver(GetMediaRouter(browser)), | 38 : media_router::IssuesObserver(GetMediaRouter(browser)), |
30 media_router::MediaRoutesObserver(GetMediaRouter(browser)), | 39 media_router::LocalMediaRoutesObserver(GetMediaRouter(browser)), |
31 media_router_active_icon_( | 40 media_router_active_icon_( |
32 ui::ResourceBundle::GetSharedInstance() | 41 ui::ResourceBundle::GetSharedInstance() |
33 .GetImageNamed(IDR_MEDIA_ROUTER_ACTIVE_ICON)), | 42 .GetImageNamed(IDR_MEDIA_ROUTER_ACTIVE_ICON)), |
34 media_router_error_icon_(ui::ResourceBundle::GetSharedInstance() | 43 media_router_error_icon_(ui::ResourceBundle::GetSharedInstance() |
35 .GetImageNamed(IDR_MEDIA_ROUTER_ERROR_ICON)), | 44 .GetImageNamed(IDR_MEDIA_ROUTER_ERROR_ICON)), |
36 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance() | 45 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance() |
37 .GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)), | 46 .GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)), |
38 media_router_warning_icon_( | 47 media_router_warning_icon_( |
39 ui::ResourceBundle::GetSharedInstance() | 48 ui::ResourceBundle::GetSharedInstance() |
40 .GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)), | 49 .GetImageNamed(IDR_MEDIA_ROUTER_WARNING_ICON)), |
41 current_icon_(&media_router_idle_icon_), | 50 current_icon_(&media_router_idle_icon_), |
42 has_local_route_(false), | 51 has_local_route_(false), |
43 delegate_(nullptr), | 52 delegate_(nullptr), |
44 browser_(browser), | 53 browser_(browser), |
45 platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)), | 54 platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)), |
46 contextual_menu_(browser), | 55 contextual_menu_(browser), |
47 tab_strip_model_observer_(this), | 56 tab_strip_model_observer_(this), |
48 weak_ptr_factory_(this) { | 57 weak_ptr_factory_(this) { |
49 DCHECK(browser_); | 58 DCHECK(browser_); |
50 tab_strip_model_observer_.Add(browser_->tab_strip_model()); | 59 tab_strip_model_observer_.Add(browser_->tab_strip_model()); |
60 OnHasLocalRouteUpdated(GetMediaRouter(browser)->HasLocalRoute()); | |
51 } | 61 } |
52 | 62 |
53 MediaRouterAction::~MediaRouterAction() { | 63 MediaRouterAction::~MediaRouterAction() { |
54 } | 64 } |
55 | 65 |
56 std::string MediaRouterAction::GetId() const { | 66 std::string MediaRouterAction::GetId() const { |
57 return ComponentToolbarActionsFactory::kMediaRouterActionId; | 67 return ComponentToolbarActionsFactory::kMediaRouterActionId; |
58 } | 68 } |
59 | 69 |
60 void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) { | 70 void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) { |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
131 bool MediaRouterAction::DisabledClickOpensMenu() const { | 141 bool MediaRouterAction::DisabledClickOpensMenu() const { |
132 return false; | 142 return false; |
133 } | 143 } |
134 | 144 |
135 void MediaRouterAction::OnIssueUpdated(const media_router::Issue* issue) { | 145 void MediaRouterAction::OnIssueUpdated(const media_router::Issue* issue) { |
136 issue_.reset(issue ? new media_router::Issue(*issue) : nullptr); | 146 issue_.reset(issue ? new media_router::Issue(*issue) : nullptr); |
137 | 147 |
138 MaybeUpdateIcon(); | 148 MaybeUpdateIcon(); |
139 } | 149 } |
140 | 150 |
141 void MediaRouterAction::OnRoutesUpdated( | 151 void MediaRouterAction::OnHasLocalRouteUpdated(bool has_local_route) { |
142 const std::vector<media_router::MediaRoute>& routes) { | 152 has_local_route_ = has_local_route; |
143 has_local_route_ = | |
144 std::find_if(routes.begin(), routes.end(), | |
145 [](const media_router::MediaRoute& route) { | |
146 return route.is_local(); }) != | |
147 routes.end(); | |
148 MaybeUpdateIcon(); | 153 MaybeUpdateIcon(); |
149 } | 154 } |
150 | 155 |
151 void MediaRouterAction::ActiveTabChanged(content::WebContents* old_contents, | 156 void MediaRouterAction::ActiveTabChanged(content::WebContents* old_contents, |
152 content::WebContents* new_contents, | 157 content::WebContents* new_contents, |
153 int index, | 158 int index, |
154 int reason) { | 159 int reason) { |
155 UpdatePopupState(); | 160 UpdatePopupState(); |
156 } | 161 } |
157 | 162 |
(...skipping 30 matching lines...) Expand all Loading... | |
188 | 193 |
189 MediaRouterDialogControllerImpl* | 194 MediaRouterDialogControllerImpl* |
190 MediaRouterAction::GetMediaRouterDialogController() { | 195 MediaRouterAction::GetMediaRouterDialogController() { |
191 DCHECK(delegate_); | 196 DCHECK(delegate_); |
192 content::WebContents* web_contents = delegate_->GetCurrentWebContents(); | 197 content::WebContents* web_contents = delegate_->GetCurrentWebContents(); |
193 DCHECK(web_contents); | 198 DCHECK(web_contents); |
194 return MediaRouterDialogControllerImpl::GetOrCreateForWebContents( | 199 return MediaRouterDialogControllerImpl::GetOrCreateForWebContents( |
195 web_contents); | 200 web_contents); |
196 } | 201 } |
197 | 202 |
198 media_router::MediaRouter* MediaRouterAction::GetMediaRouter(Browser* browser) { | |
199 return media_router::MediaRouterFactory::GetApiForBrowserContext( | |
200 static_cast<content::BrowserContext*>(browser->profile())); | |
201 } | |
202 | |
203 MediaRouterActionPlatformDelegate* MediaRouterAction::GetPlatformDelegate() { | 203 MediaRouterActionPlatformDelegate* MediaRouterAction::GetPlatformDelegate() { |
204 return platform_delegate_.get(); | 204 return platform_delegate_.get(); |
205 } | 205 } |
206 | 206 |
207 void MediaRouterAction::MaybeUpdateIcon() { | 207 void MediaRouterAction::MaybeUpdateIcon() { |
208 const gfx::Image* new_icon = GetCurrentIcon(); | 208 const gfx::Image* new_icon = GetCurrentIcon(); |
209 | 209 |
210 // Update the current state if it has changed. | 210 // Update the current state if it has changed. |
211 if (new_icon != current_icon_) { | 211 if (new_icon != current_icon_) { |
212 current_icon_ = new_icon; | 212 current_icon_ = new_icon; |
(...skipping 10 matching lines...) Expand all Loading... | |
223 if (issue_) { | 223 if (issue_) { |
224 if (issue_->severity() == media_router::Issue::FATAL) | 224 if (issue_->severity() == media_router::Issue::FATAL) |
225 return &media_router_error_icon_; | 225 return &media_router_error_icon_; |
226 if (issue_->severity() == media_router::Issue::WARNING) | 226 if (issue_->severity() == media_router::Issue::WARNING) |
227 return &media_router_warning_icon_; | 227 return &media_router_warning_icon_; |
228 } | 228 } |
229 | 229 |
230 return has_local_route_ ? | 230 return has_local_route_ ? |
231 &media_router_active_icon_ : &media_router_idle_icon_; | 231 &media_router_active_icon_ : &media_router_idle_icon_; |
232 } | 232 } |
OLD | NEW |