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

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

Issue 9372091: Polished on side-loaded extension install alert. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Corrections Created 8 years, 9 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 (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_global_error.h" 5 #include "chrome/browser/extensions/extension_global_error.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/string16.h" 8 #include "base/string16.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 message += l10n_util::GetStringFUTF16(template_message_id, 79 message += l10n_util::GetStringFUTF16(template_message_id,
80 string16(ASCIIToUTF16(e->name()))); 80 string16(ASCIIToUTF16(e->name())));
81 } 81 }
82 return message; 82 return message;
83 } 83 }
84 84
85 string16 ExtensionGlobalError::GenerateMessage() { 85 string16 ExtensionGlobalError::GenerateMessage() {
86 return GenerateMessageSection(external_extension_ids_.get(), 86 return GenerateMessageSection(external_extension_ids_.get(),
87 IDS_EXTENSION_ALERT_ITEM_EXTERNAL) + 87 IDS_EXTENSION_ALERT_ITEM_EXTERNAL) +
88 GenerateMessageSection(blacklisted_extension_ids_.get(), 88 GenerateMessageSection(blacklisted_extension_ids_.get(),
89 IDS_EXTENSION_ALERT_ITEM_EXTERNAL) + 89 IDS_EXTENSION_ALERT_ITEM_BLACKLISTED) +
90 GenerateMessageSection(orphaned_extension_ids_.get(), 90 GenerateMessageSection(orphaned_extension_ids_.get(),
91 IDS_EXTENSION_ALERT_ITEM_EXTERNAL); 91 IDS_EXTENSION_ALERT_ITEM_ORPHANED);
92 } 92 }
93 93
94 string16 ExtensionGlobalError::GetBubbleViewMessage() { 94 string16 ExtensionGlobalError::GetBubbleViewMessage() {
95 if (message_.empty()) { 95 if (message_.empty()) {
96 message_ = GenerateMessage(); 96 message_ = GenerateMessage();
97 if (message_[message_.size()-1] == '\n') {
Aaron Boodman 2012/03/02 18:47:35 No curly brace needed for two-line if statements.
98 message_.resize(message_.size()-1);
99 }
97 } 100 }
98 return message_; 101 return message_;
99 } 102 }
100 103
101 string16 ExtensionGlobalError::GetBubbleViewAcceptButtonLabel() { 104 string16 ExtensionGlobalError::GetBubbleViewAcceptButtonLabel() {
102 return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_OK); 105 return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_OK);
103 } 106 }
104 107
105 string16 ExtensionGlobalError::GetBubbleViewCancelButtonLabel() { 108 string16 ExtensionGlobalError::GetBubbleViewCancelButtonLabel() {
106 return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_DETAILS); 109 return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_DETAILS);
107 } 110 }
108 111
109 void ExtensionGlobalError::OnBubbleViewDidClose(Browser* browser) { 112 void ExtensionGlobalError::OnBubbleViewDidClose(Browser* browser) {
110 extension_service_->HandleExtensionAlertClosed(); 113 extension_service_->HandleExtensionAlertClosed();
111 } 114 }
112 115
113 void ExtensionGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) { 116 void ExtensionGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
114 extension_service_->HandleExtensionAlertAccept(); 117 extension_service_->HandleExtensionAlertAccept();
115 } 118 }
116 119
117 void ExtensionGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { 120 void ExtensionGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
118 extension_service_->HandleExtensionAlertDetails(browser); 121 extension_service_->HandleExtensionAlertDetails(browser);
119 } 122 }
OLDNEW
« chrome/app/chromium_strings.grd ('K') | « chrome/app/google_chrome_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698