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

Side by Side Diff: chrome/browser/media/router/media_router_dialog_controller.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Rebase to master Created 3 years, 11 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/media/router/media_router_dialog_controller.h" 5 #include "chrome/browser/media/router/media_router_dialog_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/media/router/media_router_metrics.h" 9 #include "chrome/browser/media/router/media_router_metrics.h"
10 #include "chrome/common/features.h"
11 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
13 #include "content/public/browser/web_contents_delegate.h" 12 #include "content/public/browser/web_contents_delegate.h"
14 13
15 #if BUILDFLAG(ANDROID_JAVA_UI) 14 #if defined(OS_ANDROID)
16 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h" 15 #include "chrome/browser/media/android/router/media_router_dialog_controller_and roid.h"
17 #else 16 #else
18 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" 17 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
19 #endif 18 #endif
20 19
21 namespace media_router { 20 namespace media_router {
22 21
23 // static 22 // static
24 MediaRouterDialogController* 23 MediaRouterDialogController*
25 MediaRouterDialogController::GetOrCreateForWebContents( 24 MediaRouterDialogController::GetOrCreateForWebContents(
26 content::WebContents* contents) { 25 content::WebContents* contents) {
27 #if BUILDFLAG(ANDROID_JAVA_UI) 26 #if defined(OS_ANDROID)
28 return MediaRouterDialogControllerAndroid::GetOrCreateForWebContents( 27 return MediaRouterDialogControllerAndroid::GetOrCreateForWebContents(
29 contents); 28 contents);
30 #else 29 #else
31 return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(contents); 30 return MediaRouterDialogControllerImpl::GetOrCreateForWebContents(contents);
32 #endif 31 #endif
33 } 32 }
34 33
35 class MediaRouterDialogController::InitiatorWebContentsObserver 34 class MediaRouterDialogController::InitiatorWebContentsObserver
36 : public content::WebContentsObserver { 35 : public content::WebContentsObserver {
37 public: 36 public:
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 MediaRouterDialogController::TakeCreateConnectionRequest() { 115 MediaRouterDialogController::TakeCreateConnectionRequest() {
117 return std::move(create_connection_request_); 116 return std::move(create_connection_request_);
118 } 117 }
119 118
120 void MediaRouterDialogController::Reset() { 119 void MediaRouterDialogController::Reset() {
121 initiator_observer_.reset(); 120 initiator_observer_.reset();
122 create_connection_request_.reset(); 121 create_connection_request_.reset();
123 } 122 }
124 123
125 } // namespace media_router 124 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698