| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/json/json_file_value_serializer.h" | 10 #include "base/json/json_file_value_serializer.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 ExtensionInstallPrompt::Prompt prompt(ExtensionInstallPrompt::INSTALL_PROMPT); | 112 ExtensionInstallPrompt::Prompt prompt(ExtensionInstallPrompt::INSTALL_PROMPT); |
| 113 std::vector<string16> permissions; | 113 std::vector<string16> permissions; |
| 114 permissions.push_back(UTF8ToUTF16("warning 1")); | 114 permissions.push_back(UTF8ToUTF16("warning 1")); |
| 115 prompt.SetPermissions(permissions); | 115 prompt.SetPermissions(permissions); |
| 116 prompt.set_extension(extension_.get()); | 116 prompt.set_extension(extension_.get()); |
| 117 prompt.set_icon(icon_); | 117 prompt.set_icon(icon_); |
| 118 | 118 |
| 119 scoped_nsobject<ExtensionInstallDialogController> | 119 scoped_nsobject<ExtensionInstallDialogController> |
| 120 controller([[ExtensionInstallDialogController alloc] | 120 controller([[ExtensionInstallDialogController alloc] |
| 121 initWithParentWindow:test_window() | 121 initWithParentWindow:test_window() |
| 122 browser:browser() | 122 navigator:browser() |
| 123 delegate:&delegate | 123 delegate:&delegate |
| 124 prompt:prompt]); | 124 prompt:prompt]); |
| 125 | 125 |
| 126 [controller window]; // force nib load | 126 [controller window]; // force nib load |
| 127 | 127 |
| 128 // Test the right nib loaded. | 128 // Test the right nib loaded. |
| 129 EXPECT_NSEQ(@"ExtensionInstallPrompt", [controller windowNibName]); | 129 EXPECT_NSEQ(@"ExtensionInstallPrompt", [controller windowNibName]); |
| 130 | 130 |
| 131 // Check all the controls. | 131 // Check all the controls. |
| 132 // Make sure everything is non-nil, and that the fields that are | 132 // Make sure everything is non-nil, and that the fields that are |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 ExtensionInstallPrompt::INSTALL_PROMPT); | 168 ExtensionInstallPrompt::INSTALL_PROMPT); |
| 169 std::vector<string16> permissions; | 169 std::vector<string16> permissions; |
| 170 permissions.push_back(UTF8ToUTF16("warning 1")); | 170 permissions.push_back(UTF8ToUTF16("warning 1")); |
| 171 prompt.SetPermissions(permissions); | 171 prompt.SetPermissions(permissions); |
| 172 prompt.set_extension(extension_.get()); | 172 prompt.set_extension(extension_.get()); |
| 173 prompt.set_icon(icon_); | 173 prompt.set_icon(icon_); |
| 174 | 174 |
| 175 scoped_nsobject<ExtensionInstallDialogController> | 175 scoped_nsobject<ExtensionInstallDialogController> |
| 176 controller([[ExtensionInstallDialogController alloc] | 176 controller([[ExtensionInstallDialogController alloc] |
| 177 initWithParentWindow:test_window() | 177 initWithParentWindow:test_window() |
| 178 browser:browser() | 178 navigator:browser() |
| 179 delegate:&delegate | 179 delegate:&delegate |
| 180 prompt:prompt]); | 180 prompt:prompt]); |
| 181 | 181 |
| 182 [controller window]; // force nib load | 182 [controller window]; // force nib load |
| 183 [controller ok:nil]; | 183 [controller ok:nil]; |
| 184 | 184 |
| 185 EXPECT_EQ(0, delegate.abort_count()); | 185 EXPECT_EQ(0, delegate.abort_count()); |
| 186 EXPECT_EQ(1, delegate.proceed_count()); | 186 EXPECT_EQ(1, delegate.proceed_count()); |
| 187 } | 187 } |
| 188 | 188 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 203 ExtensionInstallPrompt::Prompt two_warnings_prompt( | 203 ExtensionInstallPrompt::Prompt two_warnings_prompt( |
| 204 ExtensionInstallPrompt::INSTALL_PROMPT); | 204 ExtensionInstallPrompt::INSTALL_PROMPT); |
| 205 permissions.push_back(UTF8ToUTF16("warning 2")); | 205 permissions.push_back(UTF8ToUTF16("warning 2")); |
| 206 two_warnings_prompt.SetPermissions(permissions); | 206 two_warnings_prompt.SetPermissions(permissions); |
| 207 two_warnings_prompt.set_extension(extension_.get()); | 207 two_warnings_prompt.set_extension(extension_.get()); |
| 208 two_warnings_prompt.set_icon(icon_); | 208 two_warnings_prompt.set_icon(icon_); |
| 209 | 209 |
| 210 scoped_nsobject<ExtensionInstallDialogController> | 210 scoped_nsobject<ExtensionInstallDialogController> |
| 211 controller1([[ExtensionInstallDialogController alloc] | 211 controller1([[ExtensionInstallDialogController alloc] |
| 212 initWithParentWindow:test_window() | 212 initWithParentWindow:test_window() |
| 213 browser:browser() | 213 navigator:browser() |
| 214 delegate:&delegate1 | 214 delegate:&delegate1 |
| 215 prompt:one_warning_prompt]); | 215 prompt:one_warning_prompt]); |
| 216 | 216 |
| 217 [controller1 window]; // force nib load | 217 [controller1 window]; // force nib load |
| 218 | 218 |
| 219 scoped_nsobject<ExtensionInstallDialogController> | 219 scoped_nsobject<ExtensionInstallDialogController> |
| 220 controller2([[ExtensionInstallDialogController alloc] | 220 controller2([[ExtensionInstallDialogController alloc] |
| 221 initWithParentWindow:test_window() | 221 initWithParentWindow:test_window() |
| 222 browser:browser() | 222 navigator:browser() |
| 223 delegate:&delegate2 | 223 delegate:&delegate2 |
| 224 prompt:two_warnings_prompt]); | 224 prompt:two_warnings_prompt]); |
| 225 | 225 |
| 226 [controller2 window]; // force nib load | 226 [controller2 window]; // force nib load |
| 227 | 227 |
| 228 // Test control positioning. We don't test exact positioning because we don't | 228 // Test control positioning. We don't test exact positioning because we don't |
| 229 // want this to depend on string details and localization. But we do know the | 229 // want this to depend on string details and localization. But we do know the |
| 230 // relative effect that adding a second warning should have on the layout. | 230 // relative effect that adding a second warning should have on the layout. |
| 231 ASSERT_LT([[controller1 window] frame].size.height, | 231 ASSERT_LT([[controller1 window] frame].size.height, |
| 232 [[controller2 window] frame].size.height); | 232 [[controller2 window] frame].size.height); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 248 | 248 |
| 249 // No warnings should trigger skinny prompt. | 249 // No warnings should trigger skinny prompt. |
| 250 ExtensionInstallPrompt::Prompt no_warnings_prompt( | 250 ExtensionInstallPrompt::Prompt no_warnings_prompt( |
| 251 ExtensionInstallPrompt::INSTALL_PROMPT); | 251 ExtensionInstallPrompt::INSTALL_PROMPT); |
| 252 no_warnings_prompt.set_extension(extension_.get()); | 252 no_warnings_prompt.set_extension(extension_.get()); |
| 253 no_warnings_prompt.set_icon(icon_); | 253 no_warnings_prompt.set_icon(icon_); |
| 254 | 254 |
| 255 scoped_nsobject<ExtensionInstallDialogController> | 255 scoped_nsobject<ExtensionInstallDialogController> |
| 256 controller([[ExtensionInstallDialogController alloc] | 256 controller([[ExtensionInstallDialogController alloc] |
| 257 initWithParentWindow:test_window() | 257 initWithParentWindow:test_window() |
| 258 browser:browser() | 258 navigator:browser() |
| 259 delegate:&delegate | 259 delegate:&delegate |
| 260 prompt:no_warnings_prompt]); | 260 prompt:no_warnings_prompt]); |
| 261 | 261 |
| 262 [controller window]; // force nib load | 262 [controller window]; // force nib load |
| 263 | 263 |
| 264 // Test the right nib loaded. | 264 // Test the right nib loaded. |
| 265 EXPECT_NSEQ(@"ExtensionInstallPromptNoWarnings", [controller windowNibName]); | 265 EXPECT_NSEQ(@"ExtensionInstallPromptNoWarnings", [controller windowNibName]); |
| 266 | 266 |
| 267 // Check all the controls. | 267 // Check all the controls. |
| 268 // In the skinny prompt, only the icon, title and buttons are non-nill. | 268 // In the skinny prompt, only the icon, title and buttons are non-nill. |
| (...skipping 25 matching lines...) Expand all Loading... |
| 294 // No warnings should trigger skinny prompt. | 294 // No warnings should trigger skinny prompt. |
| 295 ExtensionInstallPrompt::Prompt inline_prompt( | 295 ExtensionInstallPrompt::Prompt inline_prompt( |
| 296 ExtensionInstallPrompt::INLINE_INSTALL_PROMPT); | 296 ExtensionInstallPrompt::INLINE_INSTALL_PROMPT); |
| 297 inline_prompt.SetInlineInstallWebstoreData("1,000", 3.5, 200); | 297 inline_prompt.SetInlineInstallWebstoreData("1,000", 3.5, 200); |
| 298 inline_prompt.set_extension(extension_.get()); | 298 inline_prompt.set_extension(extension_.get()); |
| 299 inline_prompt.set_icon(icon_); | 299 inline_prompt.set_icon(icon_); |
| 300 | 300 |
| 301 scoped_nsobject<ExtensionInstallDialogController> | 301 scoped_nsobject<ExtensionInstallDialogController> |
| 302 controller([[ExtensionInstallDialogController alloc] | 302 controller([[ExtensionInstallDialogController alloc] |
| 303 initWithParentWindow:test_window() | 303 initWithParentWindow:test_window() |
| 304 browser:browser() | 304 navigator:browser() |
| 305 delegate:&delegate | 305 delegate:&delegate |
| 306 prompt:inline_prompt]); | 306 prompt:inline_prompt]); |
| 307 | 307 |
| 308 [controller window]; // force nib load | 308 [controller window]; // force nib load |
| 309 | 309 |
| 310 // Test the right nib loaded. | 310 // Test the right nib loaded. |
| 311 EXPECT_NSEQ(@"ExtensionInstallPromptInline", [controller windowNibName]); | 311 EXPECT_NSEQ(@"ExtensionInstallPromptInline", [controller windowNibName]); |
| 312 | 312 |
| 313 // Check all the controls. | 313 // Check all the controls. |
| 314 EXPECT_TRUE([controller iconView] != nil); | 314 EXPECT_TRUE([controller iconView] != nil); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 336 | 336 |
| 337 // Though we have no permissions warnings, these should still be hooked up, | 337 // Though we have no permissions warnings, these should still be hooked up, |
| 338 // just invisible. | 338 // just invisible. |
| 339 EXPECT_TRUE([controller subtitleField] != nil); | 339 EXPECT_TRUE([controller subtitleField] != nil); |
| 340 EXPECT_TRUE([[controller subtitleField] isHidden]); | 340 EXPECT_TRUE([[controller subtitleField] isHidden]); |
| 341 EXPECT_TRUE([controller warningsField] != nil); | 341 EXPECT_TRUE([controller warningsField] != nil); |
| 342 EXPECT_TRUE([[controller warningsField] isHidden]); | 342 EXPECT_TRUE([[controller warningsField] isHidden]); |
| 343 EXPECT_TRUE([controller warningsSeparator] != nil); | 343 EXPECT_TRUE([controller warningsSeparator] != nil); |
| 344 EXPECT_TRUE([[controller warningsSeparator] isHidden]); | 344 EXPECT_TRUE([[controller warningsSeparator] isHidden]); |
| 345 } | 345 } |
| OLD | NEW |