OLD | NEW |
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/ui/views/critical_notification_bubble_view.h" | 5 #include "chrome/browser/ui/views/critical_notification_bubble_view.h" |
6 | 6 |
7 #include "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/lifetime/application_lifetime.h" | 10 #include "chrome/browser/lifetime/application_lifetime.h" |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 views::ColumnSet* top_columns = layout->AddColumnSet(top_column_set_id); | 169 views::ColumnSet* top_columns = layout->AddColumnSet(top_column_set_id); |
170 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 170 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
171 0, views::GridLayout::USE_PREF, 0, 0); | 171 0, views::GridLayout::USE_PREF, 0, 0); |
172 top_columns->AddPaddingColumn(0, kImageHeadlinePadding); | 172 top_columns->AddPaddingColumn(0, kImageHeadlinePadding); |
173 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 173 top_columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
174 0, views::GridLayout::USE_PREF, 0, 0); | 174 0, views::GridLayout::USE_PREF, 0, 0); |
175 top_columns->AddPaddingColumn(1, 0); | 175 top_columns->AddPaddingColumn(1, 0); |
176 layout->StartRow(0, top_column_set_id); | 176 layout->StartRow(0, top_column_set_id); |
177 | 177 |
178 views::ImageView* image = new views::ImageView(); | 178 views::ImageView* image = new views::ImageView(); |
179 image->SetImage(rb.GetBitmapNamed(IDR_UPDATE_MENU3)); | 179 image->SetImage(rb.GetImageSkiaNamed(IDR_UPDATE_MENU3)); |
180 layout->AddView(image); | 180 layout->AddView(image); |
181 | 181 |
182 headline_ = new views::Label(); | 182 headline_ = new views::Label(); |
183 headline_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont)); | 183 headline_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont)); |
184 UpdateBubbleHeadline(GetRemainingTime()); | 184 UpdateBubbleHeadline(GetRemainingTime()); |
185 layout->AddView(headline_); | 185 layout->AddView(headline_); |
186 | 186 |
187 const int middle_column_set_id = 1; | 187 const int middle_column_set_id = 1; |
188 views::ColumnSet* middle_column = layout->AddColumnSet(middle_column_set_id); | 188 views::ColumnSet* middle_column = layout->AddColumnSet(middle_column_set_id); |
189 middle_column->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, | 189 middle_column->AddColumn(views::GridLayout::CENTER, views::GridLayout::CENTER, |
(...skipping 28 matching lines...) Expand all Loading... |
218 dismiss_button_ = new views::NativeTextButton(this, | 218 dismiss_button_ = new views::NativeTextButton(this, |
219 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS)); | 219 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS)); |
220 layout->AddView(dismiss_button_); | 220 layout->AddView(dismiss_button_); |
221 | 221 |
222 refresh_timer_.Start(FROM_HERE, | 222 refresh_timer_.Start(FROM_HERE, |
223 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery), | 223 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery), |
224 this, &CriticalNotificationBubbleView::OnCountdown); | 224 this, &CriticalNotificationBubbleView::OnCountdown); |
225 | 225 |
226 content::RecordAction(UserMetricsAction("CriticalNotificationShown")); | 226 content::RecordAction(UserMetricsAction("CriticalNotificationShown")); |
227 } | 227 } |
OLD | NEW |