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

Side by Side Diff: ui/app_list/views/signin_view.cc

Issue 12330002: Add views::Button style enum for LabelButton [native] styling, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge. Created 7 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/app_list/views/signin_view.h" 5 #include "ui/app_list/views/signin_view.h"
6 6
7 #include "ui/app_list/signin_delegate.h" 7 #include "ui/app_list/signin_delegate.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/views/background.h" 9 #include "ui/views/background.h"
10 #include "ui/views/controls/button/label_button.h" 10 #include "ui/views/controls/button/label_button.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 views::Label* text = new views::Label(delegate_->GetSigninText()); 55 views::Label* text = new views::Label(delegate_->GetSigninText());
56 text->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont)); 56 text->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
57 text->SetMultiLine(true); 57 text->SetMultiLine(true);
58 text->SetHorizontalAlignment(gfx::ALIGN_LEFT); 58 text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
59 layout->StartRowWithPadding(0, kTopSetId, 0, kHeadingPadding); 59 layout->StartRowWithPadding(0, kTopSetId, 0, kHeadingPadding);
60 layout->AddView(text); 60 layout->AddView(text);
61 61
62 views::LabelButton* signin_button = new views::LabelButton( 62 views::LabelButton* signin_button = new views::LabelButton(
63 this, 63 this,
64 delegate_->GetSigninButtonText()); 64 delegate_->GetSigninButtonText());
65 signin_button->SetNativeTheme(true); 65 signin_button->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
66 layout->StartRowWithPadding(0, kTopSetId, 0, kButtonPadding); 66 layout->StartRowWithPadding(0, kTopSetId, 0, kButtonPadding);
67 layout->AddView(signin_button); 67 layout->AddView(signin_button);
68 68
69 const int kBottomSetId = 1; 69 const int kBottomSetId = 1;
70 columns = layout->AddColumnSet(kBottomSetId); 70 columns = layout->AddColumnSet(kBottomSetId);
71 columns->AddColumn(views::GridLayout::FILL, 71 columns->AddColumn(views::GridLayout::FILL,
72 views::GridLayout::FILL, 72 views::GridLayout::FILL,
73 0, 73 0,
74 views::GridLayout::USE_PREF, 74 views::GridLayout::USE_PREF,
75 0, 75 0,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 if (source == learn_more_link_) 113 if (source == learn_more_link_)
114 delegate_->OpenLearnMore(); 114 delegate_->OpenLearnMore();
115 else if (source == settings_link_) 115 else if (source == settings_link_)
116 delegate_->OpenSettings(); 116 delegate_->OpenSettings();
117 else 117 else
118 NOTREACHED(); 118 NOTREACHED();
119 } 119 }
120 } 120 }
121 121
122 } // namespace app_list 122 } // namespace app_list
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/autofill/autocheckout_bubble_views.cc ('k') | ui/views/controls/button/button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698