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

Side by Side Diff: chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+ Created 4 years, 4 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/webui/media_router/media_router_dialog_controller_im pl.h" 5 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 281 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
282 WebContents* media_router_dialog = GetMediaRouterDialog(); 282 WebContents* media_router_dialog = GetMediaRouterDialog();
283 CHECK(media_router_dialog); 283 CHECK(media_router_dialog);
284 ui::PageTransition transition_type = details.entry->GetTransitionType(); 284 ui::PageTransition transition_type = details.entry->GetTransitionType();
285 content::NavigationType nav_type = details.type; 285 content::NavigationType nav_type = details.type;
286 286
287 // New |media_router_dialog| is created. 287 // New |media_router_dialog| is created.
288 DCHECK(media_router_dialog_pending_); 288 DCHECK(media_router_dialog_pending_);
289 DCHECK(ui::PageTransitionCoreTypeIs(transition_type, 289 DCHECK(ui::PageTransitionCoreTypeIs(transition_type,
290 ui::PAGE_TRANSITION_AUTO_TOPLEVEL) && 290 ui::PAGE_TRANSITION_AUTO_TOPLEVEL) &&
291 nav_type == content::NAVIGATION_TYPE_NEW_PAGE) 291 nav_type == content::NavigationType::NEW_PAGE)
292 << "transition_type: " << transition_type << ", " 292 << "transition_type: " << transition_type << ", "
293 << "nav_type: " << nav_type; 293 << "nav_type: " << static_cast<int>(nav_type);
294 294
295 media_router_dialog_pending_ = false; 295 media_router_dialog_pending_ = false;
296 296
297 PopulateDialog(media_router_dialog); 297 PopulateDialog(media_router_dialog);
298 } 298 }
299 299
300 void MediaRouterDialogControllerImpl::PopulateDialog( 300 void MediaRouterDialogControllerImpl::PopulateDialog(
301 content::WebContents* media_router_dialog) { 301 content::WebContents* media_router_dialog) {
302 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 302 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
303 DCHECK(media_router_dialog); 303 DCHECK(media_router_dialog);
(...skipping 15 matching lines...) Expand all
319 ->GetWeakPtr(); 319 ->GetWeakPtr();
320 if (!create_connection_request.get()) { 320 if (!create_connection_request.get()) {
321 media_router_ui->InitWithDefaultMediaSource(delegate); 321 media_router_ui->InitWithDefaultMediaSource(delegate);
322 } else { 322 } else {
323 media_router_ui->InitWithPresentationSessionRequest( 323 media_router_ui->InitWithPresentationSessionRequest(
324 initiator(), delegate, std::move(create_connection_request)); 324 initiator(), delegate, std::move(create_connection_request));
325 } 325 }
326 } 326 }
327 327
328 } // namespace media_router 328 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698