chrome/browser/ui/views/content_setting_bubble_contents.cc - Issue 13584010: views: Migrate the cases of "new .*NativeTextButton(" to LabelButton.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.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:

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc

diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc

index 7190b9734b252ef5df07ea7dc2789ef72b63d154..da9ac5a94a34ad4e1579e6458477a3ba96549ced 100644

--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc

+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc

@@ -26,9 +26,9 @@

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/simple_menu_model.h"

+#include "ui/views/controls/button/label_button.h"

#include "ui/views/controls/button/menu_button.h"

#include "ui/views/controls/button/radio_button.h"

-#include "ui/views/controls/button/text_button.h"

#include "ui/views/controls/image_view.h"

#include "ui/views/controls/label.h"

#include "ui/views/controls/link.h"

@@ -402,8 +402,9 @@ void ContentSettingBubbleContents::Init() {

manage_link_->set_listener(this);

layout->AddView(manage_link_);

- close_button_ = new views::NativeTextButton(

+ close_button_ = new views::LabelButton(

this, l10n_util::GetStringUTF16(IDS_DONE));

+ close_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);

layout->AddView(close_button_);

}