| OLD | NEW |
| 1 // Copyright (c) 2010 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/options/system_page_view.h" | 5 #include "chrome/browser/chromeos/options/system_page_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| 11 #include "base/stl_util-inl.h" | 11 #include "base/stl_util-inl.h" |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 | 374 |
| 375 //////////////////////////////////////////////////////////////////////////////// | 375 //////////////////////////////////////////////////////////////////////////////// |
| 376 // SystemPageView | 376 // SystemPageView |
| 377 | 377 |
| 378 //////////////////////////////////////////////////////////////////////////////// | 378 //////////////////////////////////////////////////////////////////////////////// |
| 379 // SystemPageView, SettingsPageView implementation: | 379 // SystemPageView, SettingsPageView implementation: |
| 380 | 380 |
| 381 void SystemPageView::InitControlLayout() { | 381 void SystemPageView::InitControlLayout() { |
| 382 GridLayout* layout = CreatePanelGridLayout(this); | 382 GridLayout* layout = GridLayout::CreatePanel(this); |
| 383 SetLayoutManager(layout); | 383 SetLayoutManager(layout); |
| 384 | 384 |
| 385 int single_column_view_set_id = 0; | 385 int single_column_view_set_id = 0; |
| 386 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); | 386 ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id); |
| 387 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 387 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 388 GridLayout::USE_PREF, 0, 0); | 388 GridLayout::USE_PREF, 0, 0); |
| 389 | 389 |
| 390 layout->StartRow(0, single_column_view_set_id); | 390 layout->StartRow(0, single_column_view_set_id); |
| 391 layout->AddView(new DateTimeSection(profile())); | 391 layout->AddView(new DateTimeSection(profile())); |
| 392 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 392 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 393 layout->StartRow(0, single_column_view_set_id); | 393 layout->StartRow(0, single_column_view_set_id); |
| 394 layout->AddView(new TouchpadSection(profile())); | 394 layout->AddView(new TouchpadSection(profile())); |
| 395 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 395 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 396 layout->StartRow(0, single_column_view_set_id); | 396 layout->StartRow(0, single_column_view_set_id); |
| 397 layout->AddView(new AccessibilitySection(profile())); | 397 layout->AddView(new AccessibilitySection(profile())); |
| 398 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 398 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace chromeos | 401 } // namespace chromeos |
| OLD | NEW |