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

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

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typo in a chrome/test/BUILD.gn Created 5 years, 5 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/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
11 #include "grit/theme_resources.h" 11 #include "grit/theme_resources.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.h"
15 15
16 using media_router::MediaRouterDialogController; 16 using media_router::MediaRouterDialogControllerImpl;
17 17
18 MediaRouterAction::MediaRouterAction() 18 MediaRouterAction::MediaRouterAction()
19 : id_("media_router_action"), 19 : id_("media_router_action"),
20 name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)), 20 name_(l10n_util::GetStringUTF16(IDS_MEDIA_ROUTER_TITLE)),
21 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance(). 21 media_router_idle_icon_(ui::ResourceBundle::GetSharedInstance().
22 GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)), 22 GetImageNamed(IDR_MEDIA_ROUTER_IDLE_ICON)),
23 delegate_(nullptr) { 23 delegate_(nullptr) {
24 } 24 }
25 25
26 MediaRouterAction::~MediaRouterAction() { 26 MediaRouterAction::~MediaRouterAction() {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 } 86 }
87 87
88 bool MediaRouterAction::ExecuteAction(bool by_user) { 88 bool MediaRouterAction::ExecuteAction(bool by_user) {
89 GetMediaRouterDialogController()->ShowMediaRouterDialog(); 89 GetMediaRouterDialogController()->ShowMediaRouterDialog();
90 return true; 90 return true;
91 } 91 }
92 92
93 void MediaRouterAction::UpdateState() { 93 void MediaRouterAction::UpdateState() {
94 } 94 }
95 95
96 MediaRouterDialogController* 96 MediaRouterDialogControllerImpl*
97 MediaRouterAction::GetMediaRouterDialogController() { 97 MediaRouterAction::GetMediaRouterDialogController() {
98 DCHECK(delegate_); 98 DCHECK(delegate_);
99 content::WebContents* web_contents = delegate_->GetCurrentWebContents(); 99 content::WebContents* web_contents = delegate_->GetCurrentWebContents();
100 DCHECK(web_contents); 100 DCHECK(web_contents);
101 return MediaRouterDialogController::GetOrCreateForWebContents(web_contents); 101 return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
102 web_contents);
102 } 103 }
103 104
104 bool MediaRouterAction::DisabledClickOpensMenu() const { 105 bool MediaRouterAction::DisabledClickOpensMenu() const {
105 return false; 106 return false;
106 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698