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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

Issue 11633052: Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use gtk_widget_get_toplevel for GetNativeWindow Created 7 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 | 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/cocoa/extensions/media_galleries_dialog_cocoa.h" 5 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
6 6
7 #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h" 7 #include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h" 9 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
10 #include "chrome/browser/ui/constrained_window_tab_helper.h" 10 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "content/public/test/test_utils.h" 12 #include "content/public/test/test_utils.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using ::testing::NiceMock; 15 using ::testing::NiceMock;
16 using ::testing::Return; 16 using ::testing::Return;
17 using ::testing::ReturnRef; 17 using ::testing::ReturnRef;
18 18
19 namespace chrome { 19 namespace chrome {
20 20
(...skipping 12 matching lines...) Expand all
33 MediaGalleriesDialogController::KnownGalleryPermissions permissions; 33 MediaGalleriesDialogController::KnownGalleryPermissions permissions;
34 EXPECT_CALL(controller, permissions()). 34 EXPECT_CALL(controller, permissions()).
35 WillRepeatedly(ReturnRef(permissions)); 35 WillRepeatedly(ReturnRef(permissions));
36 36
37 scoped_ptr<MediaGalleriesDialogCocoa> dialog( 37 scoped_ptr<MediaGalleriesDialogCocoa> dialog(
38 static_cast<MediaGalleriesDialogCocoa*>( 38 static_cast<MediaGalleriesDialogCocoa*>(
39 MediaGalleriesDialog::Create(&controller))); 39 MediaGalleriesDialog::Create(&controller)));
40 scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]); 40 scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);
41 EXPECT_TRUE([window isVisible]); 41 EXPECT_TRUE([window isVisible]);
42 42
43 ConstrainedWindowTabHelper* constrained_window_tab_helper = 43 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
44 ConstrainedWindowTabHelper::FromWebContents(web_contents); 44 WebContentsModalDialogManager::FromWebContents(web_contents);
45 constrained_window_tab_helper->CloseAllDialogs(); 45 web_contents_modal_dialog_manager->CloseAllDialogs();
46 EXPECT_FALSE([window isVisible]); 46 EXPECT_FALSE([window isVisible]);
47 } 47 }
48 48
49 } // namespace chrome 49 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698