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

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

Issue 1149893020: [Media Router] Implement MediaRouterAction + MediaRouterUI tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed pkasting's 2nd comments Created 5 years, 6 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 unified diff | Download patch
OLDNEW
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/ui/toolbar/toolbar_action_view_delegate.h" 8 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
9 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"
9 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
10 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.h"
14 15
16 using media_router::MediaRouterDialogController;
17
15 MediaRouterAction::MediaRouterAction() 18 MediaRouterAction::MediaRouterAction()
16 : id_("media_router_action"), 19 : id_("media_router_action"),
17 name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)), 20 name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)),
18 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance(). 21 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance().
19 GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)), 22 GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)),
20 delegate_(nullptr) { 23 delegate_(nullptr) {
21 } 24 }
22 25
23 MediaRouterAction::~MediaRouterAction() { 26 MediaRouterAction::~MediaRouterAction() {
24 } 27 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return name_; 59 return name_;
57 } 60 }
58 61
59 bool MediaRouterAction::IsEnabled( 62 bool MediaRouterAction::IsEnabled(
60 content::WebContents* web_contents) const { 63 content::WebContents* web_contents) const {
61 return true; 64 return true;
62 } 65 }
63 66
64 bool MediaRouterAction::WantsToRun( 67 bool MediaRouterAction::WantsToRun(
65 content::WebContents* web_contents) const { 68 content::WebContents* web_contents) const {
66 NOTIMPLEMENTED();
67 return false; 69 return false;
68 } 70 }
69 71
70 bool MediaRouterAction::HasPopup( 72 bool MediaRouterAction::HasPopup(
71 content::WebContents* web_contents) const { 73 content::WebContents* web_contents) const {
72 NOTIMPLEMENTED();
73 return true; 74 return true;
74 } 75 }
75 76
76 void MediaRouterAction::HidePopup() { 77 void MediaRouterAction::HidePopup() {
77 NOTIMPLEMENTED(); 78 GetMediaRouterDialogController()->CloseMediaRouterDialog();
78 } 79 }
79 80
80 gfx::NativeView MediaRouterAction::GetPopupNativeView() { 81 gfx::NativeView MediaRouterAction::GetPopupNativeView() {
81 NOTIMPLEMENTED();
82 return nullptr; 82 return nullptr;
83 } 83 }
84 84
85 ui::MenuModel* MediaRouterAction::GetContextMenu() { 85 ui::MenuModel* MediaRouterAction::GetContextMenu() {
86 NOTIMPLEMENTED();
87 return nullptr; 86 return nullptr;
88 } 87 }
89 88
90 bool MediaRouterAction::CanDrag() const { 89 bool MediaRouterAction::CanDrag() const {
91 NOTIMPLEMENTED();
92 return false; 90 return false;
93 } 91 }
94 92
95 bool MediaRouterAction::ExecuteAction(bool by_user) { 93 bool MediaRouterAction::ExecuteAction(bool by_user) {
96 NOTIMPLEMENTED(); 94 GetMediaRouterDialogController()->ShowMediaRouterDialog();
97 return false; 95 return true;
98 } 96 }
99 97
100 void MediaRouterAction::UpdateState() { 98 void MediaRouterAction::UpdateState() {
101 NOTIMPLEMENTED(); 99 NOTIMPLEMENTED();
102 } 100 }
101
102 MediaRouterDialogController*
103 MediaRouterAction::GetMediaRouterDialogController() {
104 DCHECK(delegate_);
105 content::WebContents* web_contents = delegate_->GetCurrentWebContents();
106 DCHECK(web_contents);
107 return MediaRouterDialogController::GetOrCreateForWebContents(web_contents);
108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/media_router_action.h ('k') | chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698