OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/extension_install_dialog_view.h" | 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 // Tests that a scrollbar _is_ shown for an excessively long extension | 121 // Tests that a scrollbar _is_ shown for an excessively long extension |
122 // install prompt. | 122 // install prompt. |
123 IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) { | 123 IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) { |
124 base::string16 permission_string(base::ASCIIToUTF16("Test")); | 124 base::string16 permission_string(base::ASCIIToUTF16("Test")); |
125 PermissionMessages permissions; | 125 PermissionMessages permissions; |
126 for (int i = 0; i < 20; i++) { | 126 for (int i = 0; i < 20; i++) { |
127 permissions.push_back(PermissionMessage(permission_string, | 127 permissions.push_back(PermissionMessage(permission_string, |
128 PermissionIDSet())); | 128 PermissionIDSet())); |
129 } | 129 } |
130 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); | 130 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
131 prompt->SetPermissions(permissions, | 131 prompt->AddPermissions(permissions, |
132 ExtensionInstallPrompt::REGULAR_PERMISSIONS); | 132 ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
133 ASSERT_TRUE(IsScrollbarVisible(std::move(prompt))) | 133 ASSERT_TRUE(IsScrollbarVisible(std::move(prompt))) |
134 << "Scrollbar is not visible"; | 134 << "Scrollbar is not visible"; |
135 } | 135 } |
136 | 136 |
137 // Tests that a scrollbar isn't shown for this regression case. | 137 // Tests that a scrollbar isn't shown for this regression case. |
138 // See crbug.com/385570 for details. | 138 // See crbug.com/385570 for details. |
139 IN_PROC_BROWSER_TEST_F(ScrollbarTest, ScrollbarRegression) { | 139 IN_PROC_BROWSER_TEST_F(ScrollbarTest, ScrollbarRegression) { |
140 base::string16 permission_string(base::ASCIIToUTF16( | 140 base::string16 permission_string(base::ASCIIToUTF16( |
141 "Read and modify your data on *.facebook.com")); | 141 "Read and modify your data on *.facebook.com")); |
142 PermissionMessages permissions; | 142 PermissionMessages permissions; |
143 permissions.push_back(PermissionMessage(permission_string, | 143 permissions.push_back(PermissionMessage(permission_string, |
144 PermissionIDSet())); | 144 PermissionIDSet())); |
145 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); | 145 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt = CreatePrompt(); |
146 prompt->SetPermissions(permissions, | 146 prompt->AddPermissions(permissions, |
147 ExtensionInstallPrompt::REGULAR_PERMISSIONS); | 147 ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
148 ASSERT_FALSE(IsScrollbarVisible(std::move(prompt))) << "Scrollbar is visible"; | 148 ASSERT_FALSE(IsScrollbarVisible(std::move(prompt))) << "Scrollbar is visible"; |
149 } | 149 } |
150 | 150 |
151 class ExtensionInstallDialogViewTest | 151 class ExtensionInstallDialogViewTest |
152 : public ExtensionInstallDialogViewTestBase { | 152 : public ExtensionInstallDialogViewTestBase { |
153 protected: | 153 protected: |
154 ExtensionInstallDialogViewTest() | 154 ExtensionInstallDialogViewTest() |
155 : ExtensionInstallDialogViewTestBase( | 155 : ExtensionInstallDialogViewTestBase( |
156 ExtensionInstallPrompt::INSTALL_PROMPT) {} | 156 ExtensionInstallPrompt::INSTALL_PROMPT) {} |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 | 216 |
217 // Check initial button states. | 217 // Check initial button states. |
218 EXPECT_FALSE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)); | 218 EXPECT_FALSE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)); |
219 EXPECT_TRUE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL)); | 219 EXPECT_TRUE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_CANCEL)); |
220 | 220 |
221 // Check OK button state after timeout to verify that it is re-enabled. | 221 // Check OK button state after timeout to verify that it is re-enabled. |
222 base::RunLoop().RunUntilIdle(); | 222 base::RunLoop().RunUntilIdle(); |
223 EXPECT_TRUE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)); | 223 EXPECT_TRUE(delegate_view->IsDialogButtonEnabled(ui::DIALOG_BUTTON_OK)); |
224 delegate_view->Close(); | 224 delegate_view->Close(); |
225 } | 225 } |
OLD | NEW |