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

Side by Side Diff: chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: constrained window test Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/extensions/media_galleries_dialog_views.h" 5 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h" 8 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
9 #include "components/web_modal/web_contents_modal_dialog_host.h" 9 #include "components/web_modal/web_contents_modal_dialog_host.h"
10 #include "components/web_modal/web_contents_modal_dialog_manager.h" 10 #include "components/web_modal/web_contents_modal_dialog_manager.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // care of deleting itself after calling DeleteDelegate(). 80 // care of deleting itself after calling DeleteDelegate().
81 WebContentsModalDialogManager* web_contents_modal_dialog_manager = 81 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
82 WebContentsModalDialogManager::FromWebContents( 82 WebContentsModalDialogManager::FromWebContents(
83 controller->web_contents()); 83 controller->web_contents());
84 DCHECK(web_contents_modal_dialog_manager); 84 DCHECK(web_contents_modal_dialog_manager);
85 WebContentsModalDialogManagerDelegate* modal_delegate = 85 WebContentsModalDialogManagerDelegate* modal_delegate =
86 web_contents_modal_dialog_manager->delegate(); 86 web_contents_modal_dialog_manager->delegate();
87 DCHECK(modal_delegate); 87 DCHECK(modal_delegate);
88 window_ = views::Widget::CreateWindowAsFramelessChild( 88 window_ = views::Widget::CreateWindowAsFramelessChild(
89 this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView()); 89 this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
90 web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView()); 90 web_contents_modal_dialog_manager->ShowModalDialog(
91 window_->GetNativeView());
91 } 92 }
92 } 93 }
93 94
94 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() { 95 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {
95 if (!ControllerHasWebContents()) 96 if (!ControllerHasWebContents())
96 delete contents_; 97 delete contents_;
97 } 98 }
98 99
99 void MediaGalleriesDialogViews::InitChildViews() { 100 void MediaGalleriesDialogViews::InitChildViews() {
100 // Outer dialog layout. 101 // Outer dialog layout.
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 return controller_->web_contents() != NULL; 356 return controller_->web_contents() != NULL;
356 } 357 }
357 358
358 // MediaGalleriesDialogViewsController ----------------------------------------- 359 // MediaGalleriesDialogViewsController -----------------------------------------
359 360
360 // static 361 // static
361 MediaGalleriesDialog* MediaGalleriesDialog::Create( 362 MediaGalleriesDialog* MediaGalleriesDialog::Create(
362 MediaGalleriesDialogController* controller) { 363 MediaGalleriesDialogController* controller) {
363 return new MediaGalleriesDialogViews(controller); 364 return new MediaGalleriesDialogViews(controller);
364 } 365 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698