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 "base/run_loop.h" | 5 #include "base/run_loop.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
8 #include "chrome/browser/extensions/extension_icon_manager.h" | 8 #include "chrome/browser/extensions/extension_icon_manager.h" |
9 #include "chrome/browser/extensions/extension_install_prompt.h" | 9 #include "chrome/browser/extensions/extension_install_prompt.h" |
10 #include "chrome/browser/extensions/extension_install_prompt_experiment.h" | 10 #include "chrome/browser/extensions/extension_install_prompt_experiment.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); | 121 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); |
122 prompt_->set_icon(icon); | 122 prompt_->set_icon(icon); |
123 | 123 |
124 this->SetPromptPermissions(std::vector<base::string16>()); | 124 this->SetPromptPermissions(std::vector<base::string16>()); |
125 this->SetPromptDetails(std::vector<base::string16>()); | 125 this->SetPromptDetails(std::vector<base::string16>()); |
126 this->SetPromptRetainedFiles(std::vector<base::FilePath>()); | 126 this->SetPromptRetainedFiles(std::vector<base::FilePath>()); |
127 } | 127 } |
128 | 128 |
129 void ExtensionInstallDialogViewTestBase::SetPromptPermissions( | 129 void ExtensionInstallDialogViewTestBase::SetPromptPermissions( |
130 std::vector<base::string16> permissions) { | 130 std::vector<base::string16> permissions) { |
131 prompt_->SetPermissions(permissions); | 131 prompt_->SetPermissions(permissions, |
| 132 ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
132 } | 133 } |
133 | 134 |
134 void ExtensionInstallDialogViewTestBase::SetPromptDetails( | 135 void ExtensionInstallDialogViewTestBase::SetPromptDetails( |
135 std::vector<base::string16> details) { | 136 std::vector<base::string16> details) { |
136 prompt_->SetPermissionsDetails(details); | 137 prompt_->SetPermissionsDetails(details, |
| 138 ExtensionInstallPrompt::REGULAR_PERMISSIONS); |
137 } | 139 } |
138 | 140 |
139 void ExtensionInstallDialogViewTestBase::SetPromptRetainedFiles( | 141 void ExtensionInstallDialogViewTestBase::SetPromptRetainedFiles( |
140 std::vector<base::FilePath> files) { | 142 std::vector<base::FilePath> files) { |
141 prompt_->set_retained_files(files); | 143 prompt_->set_retained_files(files); |
142 } | 144 } |
143 | 145 |
144 class ScrollbarTest : public ExtensionInstallDialogViewTestBase { | 146 class ScrollbarTest : public ExtensionInstallDialogViewTestBase { |
145 protected: | 147 protected: |
146 ScrollbarTest(); | 148 ScrollbarTest(); |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 // proceed or cancel. | 254 // proceed or cancel. |
253 MockExtensionInstallPromptDelegate delegate; | 255 MockExtensionInstallPromptDelegate delegate; |
254 scoped_ptr<ExtensionInstallDialogView> dialog( | 256 scoped_ptr<ExtensionInstallDialogView> dialog( |
255 new ExtensionInstallDialogView(web_contents(), &delegate, prompt())); | 257 new ExtensionInstallDialogView(web_contents(), &delegate, prompt())); |
256 dialog.reset(); | 258 dialog.reset(); |
257 | 259 |
258 EXPECT_EQ(1, delegate.abort_count()); | 260 EXPECT_EQ(1, delegate.abort_count()); |
259 EXPECT_EQ(0, delegate.proceed_count()); | 261 EXPECT_EQ(0, delegate.proceed_count()); |
260 } | 262 } |
261 } | 263 } |
OLD | NEW |