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

Unified Diff: chrome/browser/ui/views/global_error_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/global_error_bubble_view.cc
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc
index 154e41dd17c08324c461c99c5396f92cb49931bf..96223686a1e95a5d79b1c23b56e3d6b2a810b1b5 100644
--- a/chrome/browser/ui/views/global_error_bubble_view.cc
+++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/ui/views/toolbar_view.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/grid_layout.h"
@@ -87,15 +87,17 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(
message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
string16 accept_string(error_->GetBubbleViewAcceptButtonLabel());
- scoped_ptr<views::TextButton> accept_button(
- new views::NativeTextButton(this, accept_string));
+ scoped_ptr<views::LabelButton> accept_button(
+ new views::LabelButton(this, accept_string));
+ accept_button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
accept_button->SetIsDefault(true);
accept_button->set_tag(TAG_ACCEPT_BUTTON);
string16 cancel_string(error_->GetBubbleViewCancelButtonLabel());
- scoped_ptr<views::TextButton> cancel_button;
+ scoped_ptr<views::LabelButton> cancel_button;
if (!cancel_string.empty()) {
- cancel_button.reset(new views::NativeTextButton(this, cancel_string));
+ cancel_button.reset(new views::LabelButton(this, cancel_string));
+ cancel_button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
cancel_button->set_tag(TAG_CANCEL_BUTTON);
}
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/location_bar/zoom_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698