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

Side by Side Diff: chrome/browser/ui/views/critical_notification_bubble_view.cc

Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: back out the changes to one_click_signin_bubble_view.* Created 7 years, 8 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 | Annotate | Revision Log
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/ui/views/critical_notification_bubble_view.h" 5 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/lifetime/application_lifetime.h" 11 #include "chrome/browser/lifetime/application_lifetime.h"
12 #include "chrome/browser/upgrade_detector.h" 12 #include "chrome/browser/upgrade_detector.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/user_metrics.h" 14 #include "content/public/browser/user_metrics.h"
15 #include "grit/chromium_strings.h" 15 #include "grit/chromium_strings.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "grit/locale_settings.h" 17 #include "grit/locale_settings.h"
18 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
19 #include "ui/base/accelerators/accelerator.h" 19 #include "ui/base/accelerators/accelerator.h"
20 #include "ui/base/accessibility/accessible_view_state.h" 20 #include "ui/base/accessibility/accessible_view_state.h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 #include "ui/views/controls/button/text_button.h" 23 #include "ui/views/controls/button/label_button.h"
24 #include "ui/views/controls/image_view.h" 24 #include "ui/views/controls/image_view.h"
25 #include "ui/views/controls/label.h" 25 #include "ui/views/controls/label.h"
26 #include "ui/views/layout/grid_layout.h" 26 #include "ui/views/layout/grid_layout.h"
27 #include "ui/views/layout/layout_constants.h" 27 #include "ui/views/layout/layout_constants.h"
28 #include "ui/views/widget/widget.h" 28 #include "ui/views/widget/widget.h"
29 29
30 using content::UserMetricsAction; 30 using content::UserMetricsAction;
31 31
32 namespace { 32 namespace {
33 33
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 views::ColumnSet* bottom_columns = layout->AddColumnSet(bottom_column_set_id); 203 views::ColumnSet* bottom_columns = layout->AddColumnSet(bottom_column_set_id);
204 bottom_columns->AddPaddingColumn(1, 0); 204 bottom_columns->AddPaddingColumn(1, 0);
205 bottom_columns->AddColumn(views::GridLayout::CENTER, 205 bottom_columns->AddColumn(views::GridLayout::CENTER,
206 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); 206 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
207 bottom_columns->AddPaddingColumn(0, views::kRelatedButtonHSpacing); 207 bottom_columns->AddPaddingColumn(0, views::kRelatedButtonHSpacing);
208 bottom_columns->AddColumn(views::GridLayout::CENTER, 208 bottom_columns->AddColumn(views::GridLayout::CENTER,
209 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); 209 views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0);
210 layout->StartRowWithPadding(0, bottom_column_set_id, 210 layout->StartRowWithPadding(0, bottom_column_set_id,
211 0, kMessageBubblePadding); 211 0, kMessageBubblePadding);
212 212
213 restart_button_ = new views::NativeTextButton(this, 213 restart_button_ = new views::LabelButton(this,
214 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_RESTART)); 214 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_RESTART));
215 restart_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
215 restart_button_->SetIsDefault(true); 216 restart_button_->SetIsDefault(true);
216 layout->AddView(restart_button_); 217 layout->AddView(restart_button_);
217 dismiss_button_ = new views::NativeTextButton(this, 218 dismiss_button_ = new views::LabelButton(this,
218 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS)); 219 l10n_util::GetStringUTF16(IDS_CRITICAL_NOTIFICATION_DISMISS));
220 dismiss_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
219 layout->AddView(dismiss_button_); 221 layout->AddView(dismiss_button_);
220 222
221 refresh_timer_.Start(FROM_HERE, 223 refresh_timer_.Start(FROM_HERE,
222 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery), 224 base::TimeDelta::FromMilliseconds(kRefreshBubbleEvery),
223 this, &CriticalNotificationBubbleView::OnCountdown); 225 this, &CriticalNotificationBubbleView::OnCountdown);
224 226
225 content::RecordAction(UserMetricsAction("CriticalNotificationShown")); 227 content::RecordAction(UserMetricsAction("CriticalNotificationShown"));
226 } 228 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/critical_notification_bubble_view.h ('k') | chrome/browser/ui/views/download/download_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698