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

Unified Diff: ash/shell/widgets.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/widgets.cc
diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc
index 3db77271d4927b7629fd5a5eab8daf366ab775bb..c94b0cb8fc758a86ec318dce7745abd4cf684a0e 100644
--- a/ash/shell/widgets.cc
+++ b/ash/shell/widgets.cc
@@ -57,20 +57,23 @@ WidgetsWindow::WidgetsWindow()
disabled_button_(
new views::LabelButton(NULL, base::ASCIIToUTF16("Disabled button"))),
checkbox_(new views::Checkbox(base::ASCIIToUTF16("Checkbox"))),
- checkbox_disabled_(new views::Checkbox(
- base::ASCIIToUTF16("Checkbox disabled"))),
- checkbox_checked_(new views::Checkbox(
- base::ASCIIToUTF16("Checkbox checked"))),
- checkbox_checked_disabled_(new views::Checkbox(
- base::ASCIIToUTF16("Checkbox checked disabled"))),
- radio_button_(new views::RadioButton(
- base::ASCIIToUTF16("Radio button"), 0)),
- radio_button_disabled_(new views::RadioButton(
- base::ASCIIToUTF16("Radio button disabled"), 0)),
- radio_button_selected_(new views::RadioButton(
- base::ASCIIToUTF16("Radio button selected"), 0)),
+ checkbox_disabled_(
+ new views::Checkbox(base::ASCIIToUTF16("Checkbox disabled"))),
+ checkbox_checked_(
+ new views::Checkbox(base::ASCIIToUTF16("Checkbox checked"))),
+ checkbox_checked_disabled_(
+ new views::Checkbox(base::ASCIIToUTF16("Checkbox checked disabled"))),
+ radio_button_(
+ new views::RadioButton(base::ASCIIToUTF16("Radio button"), 0)),
+ radio_button_disabled_(
+ new views::RadioButton(base::ASCIIToUTF16("Radio button disabled"),
+ 0)),
+ radio_button_selected_(
+ new views::RadioButton(base::ASCIIToUTF16("Radio button selected"),
+ 0)),
radio_button_selected_disabled_(new views::RadioButton(
- base::ASCIIToUTF16("Radio button selected disabled"), 1)) {
+ base::ASCIIToUTF16("Radio button selected disabled"),
+ 1)) {
button_->SetStyle(views::Button::STYLE_BUTTON);
AddChildView(button_);
disabled_button_->SetEnabled(false);
@@ -94,8 +97,7 @@ WidgetsWindow::WidgetsWindow()
AddChildView(radio_button_selected_disabled_);
}
-WidgetsWindow::~WidgetsWindow() {
-}
+WidgetsWindow::~WidgetsWindow() {}
void WidgetsWindow::OnPaint(gfx::Canvas* canvas) {
canvas->FillRect(GetLocalBounds(), SK_ColorWHITE);
@@ -136,9 +138,8 @@ namespace shell {
void CreateWidgetsWindow() {
gfx::Rect bounds(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight);
- views::Widget* widget =
- views::Widget::CreateWindowWithContextAndBounds(
- new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);
+ views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
+ new WidgetsWindow, Shell::GetPrimaryRootWindow(), bounds);
widget->GetNativeView()->SetName("WidgetsWindow");
widget->Show();
}
« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698