OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chromeos/login/eula_view.h" | 5 #include "chrome/browser/chromeos/login/eula_view.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <sys/types.h> | 8 #include <sys/types.h> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 std::string* password_; | 123 std::string* password_; |
124 | 124 |
125 views::Label* busy_label_; | 125 views::Label* busy_label_; |
126 views::Label* password_label_; | 126 views::Label* password_label_; |
127 views::Throbber* throbber_; | 127 views::Throbber* throbber_; |
128 | 128 |
129 DISALLOW_COPY_AND_ASSIGN(TpmInfoView); | 129 DISALLOW_COPY_AND_ASSIGN(TpmInfoView); |
130 }; | 130 }; |
131 | 131 |
132 void TpmInfoView::Init() { | 132 void TpmInfoView::Init() { |
133 views::GridLayout* layout = CreatePanelGridLayout(this); | 133 views::GridLayout* layout = views::GridLayout::CreatePanel(this); |
134 SetLayoutManager(layout); | 134 SetLayoutManager(layout); |
135 views::ColumnSet* column_set = layout->AddColumnSet(0); | 135 views::ColumnSet* column_set = layout->AddColumnSet(0); |
136 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 136 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
137 views::GridLayout::USE_PREF, 0, 0); | 137 views::GridLayout::USE_PREF, 0, 0); |
138 layout->StartRow(0, 0); | 138 layout->StartRow(0, 0); |
139 views::Label* label = new views::Label(UTF16ToWide( | 139 views::Label* label = new views::Label(UTF16ToWide( |
140 l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION))); | 140 l10n_util::GetStringUTF16(IDS_EULA_SYSTEM_SECURITY_SETTING_DESCRIPTION))); |
141 label->SetMultiLine(true); | 141 label->SetMultiLine(true); |
142 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); | 142 label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |
143 layout->AddView(label); | 143 layout->AddView(label); |
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 bool EulaView::OnKeyPressed(const views::KeyEvent&) { | 533 bool EulaView::OnKeyPressed(const views::KeyEvent&) { |
534 // Close message bubble if shown. bubble_ will be set to NULL in callback. | 534 // Close message bubble if shown. bubble_ will be set to NULL in callback. |
535 if (bubble_) { | 535 if (bubble_) { |
536 bubble_->Close(); | 536 bubble_->Close(); |
537 return true; | 537 return true; |
538 } | 538 } |
539 return false; | 539 return false; |
540 } | 540 } |
541 | 541 |
542 } // namespace chromeos | 542 } // namespace chromeos |
OLD | NEW |