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

Side by Side Diff: chrome/browser/extensions/extension_disabled_ui.cc

Issue 2123653007: Removing redundant string from remote installation permission dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/extensions/extension_disabled_ui.h" 5 #include "chrome/browser/extensions/extension_disabled_ui.h"
6 6
7 #include <bitset> 7 #include <bitset>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 base::UTF8ToUTF16(extension_->name())); 290 base::UTF8ToUTF16(extension_->name()));
291 } 291 }
292 } 292 }
293 293
294 std::vector<base::string16> 294 std::vector<base::string16>
295 ExtensionDisabledGlobalError::GetBubbleViewMessages() { 295 ExtensionDisabledGlobalError::GetBubbleViewMessages() {
296 std::vector<base::string16> messages; 296 std::vector<base::string16> messages;
297 PermissionMessages permission_warnings = 297 PermissionMessages permission_warnings =
298 extension_->permissions_data()->GetPermissionMessages(); 298 extension_->permissions_data()->GetPermissionMessages();
299 if (is_remote_install_) { 299 if (is_remote_install_) {
300 messages.push_back(l10n_util::GetStringFUTF16(
301 extension_->is_app()
302 ? IDS_APP_DISABLED_REMOTE_INSTALL_ERROR_LABEL
303 : IDS_EXTENSION_DISABLED_REMOTE_INSTALL_ERROR_LABEL,
304 base::UTF8ToUTF16(extension_->name())));
305 if (!permission_warnings.empty()) 300 if (!permission_warnings.empty())
306 messages.push_back( 301 messages.push_back(
307 l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO)); 302 l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO));
308 } else { 303 } else {
309 // TODO(treib): If NeedCustodianApprovalForPermissionIncrease, add an extra 304 // TODO(treib): If NeedCustodianApprovalForPermissionIncrease, add an extra
310 // message for supervised users. crbug.com/461261 305 // message for supervised users. crbug.com/461261
311 messages.push_back(l10n_util::GetStringFUTF16( 306 messages.push_back(l10n_util::GetStringFUTF16(
312 extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL 307 extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL
313 : IDS_EXTENSION_DISABLED_ERROR_LABEL, 308 : IDS_EXTENSION_DISABLED_ERROR_LABEL,
314 base::UTF8ToUTF16(extension_->name()))); 309 base::UTF8ToUTF16(extension_->name())));
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 content::WebContents* web_contents, 492 content::WebContents* web_contents,
498 const Extension* extension) { 493 const Extension* extension) {
499 std::unique_ptr<ExtensionInstallPrompt> install_ui( 494 std::unique_ptr<ExtensionInstallPrompt> install_ui(
500 new ExtensionInstallPrompt(web_contents)); 495 new ExtensionInstallPrompt(web_contents));
501 // This object manages its own lifetime. 496 // This object manages its own lifetime.
502 new ExtensionDisabledDialogDelegate(service, std::move(install_ui), 497 new ExtensionDisabledDialogDelegate(service, std::move(install_ui),
503 extension); 498 extension);
504 } 499 }
505 500
506 } // namespace extensions 501 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698