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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_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, 5 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 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h"
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h" 8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h"
9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h" 9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h"
10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" 10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
(...skipping 19 matching lines...) Expand all
30 30
31 chrome::MockExtensionInstallPromptDelegate delegate; 31 chrome::MockExtensionInstallPromptDelegate delegate;
32 ExtensionInstallPrompt::Prompt prompt = 32 ExtensionInstallPrompt::Prompt prompt =
33 chrome::BuildExtensionInstallPrompt(extension_); 33 chrome::BuildExtensionInstallPrompt(extension_);
34 34
35 ExtensionInstallDialogController* controller = 35 ExtensionInstallDialogController* controller =
36 new ExtensionInstallDialogController(show_params, 36 new ExtensionInstallDialogController(show_params,
37 &delegate, 37 &delegate,
38 prompt); 38 prompt);
39 39
40 scoped_nsobject<NSWindow> window( 40 base::scoped_nsobject<NSWindow> window(
41 [[[controller->view_controller() view] window] retain]); 41 [[[controller->view_controller() view] window] retain]);
42 EXPECT_TRUE([window isVisible]); 42 EXPECT_TRUE([window isVisible]);
43 43
44 // Press cancel to close the window 44 // Press cancel to close the window
45 [[controller->view_controller() cancelButton] performClick:nil]; 45 [[controller->view_controller() cancelButton] performClick:nil];
46 46
47 // Wait for the window to finish closing. 47 // Wait for the window to finish closing.
48 EXPECT_FALSE([window isVisible]); 48 EXPECT_FALSE([window isVisible]);
49 } 49 }
50 50
51 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, Permissions) { 51 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, Permissions) {
52 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 52 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
53 ExtensionInstallPrompt::ShowParams show_params(tab); 53 ExtensionInstallPrompt::ShowParams show_params(tab);
54 54
55 chrome::MockExtensionInstallPromptDelegate delegate; 55 chrome::MockExtensionInstallPromptDelegate delegate;
56 ExtensionInstallPrompt::Prompt prompt = 56 ExtensionInstallPrompt::Prompt prompt =
57 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_); 57 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_);
58 58
59 ExtensionInstallDialogController* controller = 59 ExtensionInstallDialogController* controller =
60 new ExtensionInstallDialogController(show_params, 60 new ExtensionInstallDialogController(show_params,
61 &delegate, 61 &delegate,
62 prompt); 62 prompt);
63 63
64 scoped_nsobject<NSWindow> window( 64 base::scoped_nsobject<NSWindow> window(
65 [[[controller->view_controller() view] window] retain]); 65 [[[controller->view_controller() view] window] retain]);
66 EXPECT_TRUE([window isVisible]); 66 EXPECT_TRUE([window isVisible]);
67 67
68 // Press cancel to close the window 68 // Press cancel to close the window
69 [[controller->view_controller() cancelButton] performClick:nil]; 69 [[controller->view_controller() cancelButton] performClick:nil];
70 70
71 // Wait for the window to finish closing. 71 // Wait for the window to finish closing.
72 EXPECT_FALSE([window isVisible]); 72 EXPECT_FALSE([window isVisible]);
73 } 73 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698