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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc

Issue 501273002: Update extension install prompt to reflect withheld permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor changes Created 6 years, 3 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
OLDNEW
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); 113 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap);
114 prompt_->set_icon(icon); 114 prompt_->set_icon(icon);
115 115
116 this->SetPromptPermissions(std::vector<base::string16>()); 116 this->SetPromptPermissions(std::vector<base::string16>());
117 this->SetPromptDetails(std::vector<base::string16>()); 117 this->SetPromptDetails(std::vector<base::string16>());
118 this->SetPromptRetainedFiles(std::vector<base::FilePath>()); 118 this->SetPromptRetainedFiles(std::vector<base::FilePath>());
119 } 119 }
120 120
121 void ScrollbarTest::SetPromptPermissions( 121 void ScrollbarTest::SetPromptPermissions(
122 std::vector<base::string16> permissions) { 122 std::vector<base::string16> permissions) {
123 prompt_->SetPermissions(permissions); 123 prompt_->SetPermissions(permissions,
124 ExtensionInstallPrompt::REGULAR_PERMISSIONS);
124 } 125 }
125 126
126 void ScrollbarTest::SetPromptDetails( 127 void ScrollbarTest::SetPromptDetails(
127 std::vector<base::string16> details) { 128 std::vector<base::string16> details) {
128 prompt_->SetPermissionsDetails(details); 129 prompt_->SetPermissionsDetails(details,
130 ExtensionInstallPrompt::REGULAR_PERMISSIONS);
129 } 131 }
130 132
131 void ScrollbarTest::SetPromptRetainedFiles( 133 void ScrollbarTest::SetPromptRetainedFiles(
132 std::vector<base::FilePath> files) { 134 std::vector<base::FilePath> files) {
133 prompt_->set_retained_files(files); 135 prompt_->set_retained_files(files);
134 } 136 }
135 137
136 bool ScrollbarTest::IsScrollbarVisible() { 138 bool ScrollbarTest::IsScrollbarVisible() {
137 ExtensionInstallPrompt::ShowParams show_params(web_contents_); 139 ExtensionInstallPrompt::ShowParams show_params(web_contents_);
138 MockExtensionInstallPromptDelegate delegate; 140 MockExtensionInstallPromptDelegate delegate;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 base::string16 permission_string(base::ASCIIToUTF16( 173 base::string16 permission_string(base::ASCIIToUTF16(
172 "Read and modify your data on *.facebook.com")); 174 "Read and modify your data on *.facebook.com"));
173 std::vector<base::string16> permissions; 175 std::vector<base::string16> permissions;
174 permissions.push_back(permission_string); 176 permissions.push_back(permission_string);
175 this->SetPromptPermissions(permissions); 177 this->SetPromptPermissions(permissions);
176 std::vector<base::string16> details; 178 std::vector<base::string16> details;
177 details.push_back(base::string16()); 179 details.push_back(base::string16());
178 this->SetPromptDetails(details); 180 this->SetPromptDetails(details);
179 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible"; 181 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible";
180 } 182 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698