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

Unified 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: Fixed the include for MediaRouterDialogControllerImpl 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/media_router_action.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action.cc b/chrome/browser/ui/toolbar/media_router_action.cc
index 6c68aea185ddd025b4e9b6066dae01841e008ff4..d395fb43d1d53a548a6636261e704a855f05b3b3 100644
--- a/chrome/browser/ui/toolbar/media_router_action.cc
+++ b/chrome/browser/ui/toolbar/media_router_action.cc
@@ -7,14 +7,14 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/toolbar/media_router_action_platform_delegate.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"
+#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
#include "chrome/grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_skia.h"
-using media_router::MediaRouterDialogController;
+using media_router::MediaRouterDialogControllerImpl;
MediaRouterAction::MediaRouterAction(Browser* browser)
: id_("media_router_action"),
@@ -97,12 +97,13 @@ bool MediaRouterAction::ExecuteAction(bool by_user) {
void MediaRouterAction::UpdateState() {
}
-MediaRouterDialogController*
+MediaRouterDialogControllerImpl*
MediaRouterAction::GetMediaRouterDialogController() {
DCHECK(delegate_);
content::WebContents* web_contents = delegate_->GetCurrentWebContents();
DCHECK(web_contents);
- return MediaRouterDialogController::GetOrCreateForWebContents(web_contents);
+ return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(
+ web_contents);
}
bool MediaRouterAction::DisabledClickOpensMenu() const {

Powered by Google App Engine
This is Rietveld 408576698