chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm ('k') | chrome/browser/ui/cocoa/extensions/native_app_window_cocoa.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_galleries/media_galleries_dialog_controller_mock. h"	7 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock. h"

8 #include "chrome/browser/ui/browser.h"	8 #include "chrome/browser/ui/browser.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/tabs/tab_strip_model.h"	10 #include "chrome/browser/ui/tabs/tab_strip_model.h"

(...skipping 26 matching lines...) Expand all Loading...
37 EXPECT_CALL(controller, AttachedPermissions()).	37 EXPECT_CALL(controller, AttachedPermissions()).

38 WillRepeatedly(Return(attached_permissions));	38 WillRepeatedly(Return(attached_permissions));

39 MediaGalleriesDialogController::GalleryPermissionsVector	39 MediaGalleriesDialogController::GalleryPermissionsVector

40 unattached_permissions;	40 unattached_permissions;

41 EXPECT_CALL(controller, UnattachedPermissions()).	41 EXPECT_CALL(controller, UnattachedPermissions()).

42 WillRepeatedly(Return(unattached_permissions));	42 WillRepeatedly(Return(unattached_permissions));

43	43

44 scoped_ptr<MediaGalleriesDialogCocoa> dialog(	44 scoped_ptr<MediaGalleriesDialogCocoa> dialog(

45 static_cast<MediaGalleriesDialogCocoa*>(	45 static_cast<MediaGalleriesDialogCocoa*>(

46 MediaGalleriesDialog::Create(&controller)));	46 MediaGalleriesDialog::Create(&controller)));

47 scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);	47 base::scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);

48 EXPECT_TRUE([window isVisible]);	48 EXPECT_TRUE([window isVisible]);

49	49

50 WebContentsModalDialogManager* web_contents_modal_dialog_manager =	50 WebContentsModalDialogManager* web_contents_modal_dialog_manager =

51 WebContentsModalDialogManager::FromWebContents(web_contents);	51 WebContentsModalDialogManager::FromWebContents(web_contents);

52 WebContentsModalDialogManager::TestApi test_api(	52 WebContentsModalDialogManager::TestApi test_api(

53 web_contents_modal_dialog_manager);	53 web_contents_modal_dialog_manager);

54 test_api.CloseAllDialogs();	54 test_api.CloseAllDialogs();

55 EXPECT_FALSE([window isVisible]);	55 EXPECT_FALSE([window isVisible]);

56 }	56 }

57	57

58 } // namespace chrome	58 } // namespace chrome

OLD	NEW