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

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

Issue 1137503006: [Extensions] Polish the suspicious extension bubble (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finnur's Created 5 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_message_bubble_view.h" 5 #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/extension_message_bubble_controller.h" 8 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/grit/locale_settings.h" 10 #include "chrome/grit/locale_settings.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id); 116 views::ColumnSet* upper_columns = layout->AddColumnSet(text_column_set_id);
117 upper_columns->AddColumn( 117 upper_columns->AddColumn(
118 views::GridLayout::LEADING, views::GridLayout::LEADING, 118 views::GridLayout::LEADING, views::GridLayout::LEADING,
119 0, views::GridLayout::USE_PREF, 0, 0); 119 0, views::GridLayout::USE_PREF, 0, 0);
120 layout->StartRow(0, text_column_set_id); 120 layout->StartRow(0, text_column_set_id);
121 121
122 views::Label* message = new views::Label(); 122 views::Label* message = new views::Label();
123 message->SetMultiLine(true); 123 message->SetMultiLine(true);
124 message->SetHorizontalAlignment(gfx::ALIGN_LEFT); 124 message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
125 message->SetText(delegate->GetMessageBody( 125 message->SetText(delegate->GetMessageBody(
126 anchor_view_->id() == VIEW_ID_BROWSER_ACTION)); 126 anchor_view_->id() == VIEW_ID_BROWSER_ACTION,
127 controller_->GetExtensionIdList().size()));
127 message->SizeToFit(views::Widget::GetLocalizedContentsWidth( 128 message->SizeToFit(views::Widget::GetLocalizedContentsWidth(
128 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS)); 129 IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS));
129 layout->AddView(message); 130 layout->AddView(message);
130 131
131 if (delegate->ShouldShowExtensionList()) { 132 if (delegate->ShouldShowExtensionList()) {
132 const int extension_list_column_set_id = 2; 133 const int extension_list_column_set_id = 2;
133 views::ColumnSet* middle_columns = 134 views::ColumnSet* middle_columns =
134 layout->AddColumnSet(extension_list_column_set_id); 135 layout->AddColumnSet(extension_list_column_set_id);
135 middle_columns->AddPaddingColumn(0, kExtensionListPadding); 136 middle_columns->AddPaddingColumn(0, kExtensionListPadding);
136 middle_columns->AddColumn( 137 middle_columns->AddColumn(
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 state->role = ui::AX_ROLE_ALERT; 207 state->role = ui::AX_ROLE_ALERT;
207 } 208 }
208 209
209 void ExtensionMessageBubbleView::ViewHierarchyChanged( 210 void ExtensionMessageBubbleView::ViewHierarchyChanged(
210 const ViewHierarchyChangedDetails& details) { 211 const ViewHierarchyChangedDetails& details) {
211 if (details.is_add && details.child == this) 212 if (details.is_add && details.child == this)
212 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); 213 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
213 } 214 }
214 215
215 } // namespace extensions 216 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_message_bubble_bridge.mm ('k') | chrome/common/url_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698