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/media/router/media_router_dialog_controller.h" | 5 #include "chrome/browser/media/router/media_router_dialog_controller.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "chrome/browser/media/router/media_router_metrics.h" | 9 #include "chrome/browser/media/router/media_router_metrics.h" |
8 #include "chrome/common/features.h" | 10 #include "chrome/common/features.h" |
9 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
10 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
11 #include "content/public/browser/web_contents_delegate.h" | 13 #include "content/public/browser/web_contents_delegate.h" |
12 | 14 |
13 #if BUILDFLAG(ANDROID_JAVA_UI) | 15 #if BUILDFLAG(ANDROID_JAVA_UI) |
14 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" | 16 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" |
15 #else | 17 #else |
16 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im
pl.h" | 18 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im
pl.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 } | 75 } |
74 | 76 |
75 bool MediaRouterDialogController::ShowMediaRouterDialogForPresentation( | 77 bool MediaRouterDialogController::ShowMediaRouterDialogForPresentation( |
76 scoped_ptr<CreatePresentationConnectionRequest> request) { | 78 scoped_ptr<CreatePresentationConnectionRequest> request) { |
77 DCHECK(thread_checker_.CalledOnValidThread()); | 79 DCHECK(thread_checker_.CalledOnValidThread()); |
78 | 80 |
79 // Check if the media router dialog exists for |initiator| and return if so. | 81 // Check if the media router dialog exists for |initiator| and return if so. |
80 if (IsShowingMediaRouterDialog()) | 82 if (IsShowingMediaRouterDialog()) |
81 return false; | 83 return false; |
82 | 84 |
83 create_connection_request_ = request.Pass(); | 85 create_connection_request_ = std::move(request); |
84 initiator_observer_.reset(new InitiatorWebContentsObserver(initiator_, this)); | 86 initiator_observer_.reset(new InitiatorWebContentsObserver(initiator_, this)); |
85 CreateMediaRouterDialog(); | 87 CreateMediaRouterDialog(); |
86 | 88 |
87 // Show the initiator holding the existing media router dialog. | 89 // Show the initiator holding the existing media router dialog. |
88 ActivateInitiatorWebContents(); | 90 ActivateInitiatorWebContents(); |
89 | 91 |
90 media_router::MediaRouterMetrics::RecordMediaRouterDialogOrigin( | 92 media_router::MediaRouterMetrics::RecordMediaRouterDialogOrigin( |
91 MediaRouterDialogOpenOrigin::PAGE); | 93 MediaRouterDialogOpenOrigin::PAGE); |
92 | 94 |
93 return true; | 95 return true; |
(...skipping 19 matching lines...) Expand all Loading... |
113 CloseMediaRouterDialog(); | 115 CloseMediaRouterDialog(); |
114 Reset(); | 116 Reset(); |
115 } | 117 } |
116 | 118 |
117 void MediaRouterDialogController::ActivateInitiatorWebContents() { | 119 void MediaRouterDialogController::ActivateInitiatorWebContents() { |
118 initiator_->GetDelegate()->ActivateContents(initiator_); | 120 initiator_->GetDelegate()->ActivateContents(initiator_); |
119 } | 121 } |
120 | 122 |
121 scoped_ptr<CreatePresentationConnectionRequest> | 123 scoped_ptr<CreatePresentationConnectionRequest> |
122 MediaRouterDialogController::TakeCreateConnectionRequest() { | 124 MediaRouterDialogController::TakeCreateConnectionRequest() { |
123 return create_connection_request_.Pass(); | 125 return std::move(create_connection_request_); |
124 } | 126 } |
125 | 127 |
126 void MediaRouterDialogController::Reset() { | 128 void MediaRouterDialogController::Reset() { |
127 initiator_observer_.reset(); | 129 initiator_observer_.reset(); |
128 create_connection_request_.reset(); | 130 create_connection_request_.reset(); |
129 } | 131 } |
130 | 132 |
131 } // namespace media_router | 133 } // namespace media_router |
OLD | NEW |