| 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/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 "base/stl_util-inl.h" | 10 #include "base/stl_util-inl.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
| 23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/models/combobox_model.h" | 25 #include "ui/base/models/combobox_model.h" |
| 26 #include "unicode/timezone.h" | 26 #include "unicode/timezone.h" |
| 27 #include "views/controls/button/checkbox.h" | 27 #include "views/controls/button/checkbox.h" |
| 28 #include "views/controls/button/native_button.h" | 28 #include "views/controls/button/native_button.h" |
| 29 #include "views/controls/combobox/combobox.h" | 29 #include "views/controls/combobox/combobox.h" |
| 30 #include "views/controls/slider/slider.h" | 30 #include "views/controls/slider/slider.h" |
| 31 #include "views/layout/layout_constants.h" |
| 31 #include "views/window/window.h" | 32 #include "views/window/window.h" |
| 32 | 33 |
| 33 namespace chromeos { | 34 namespace chromeos { |
| 34 | 35 |
| 35 //////////////////////////////////////////////////////////////////////////////// | 36 //////////////////////////////////////////////////////////////////////////////// |
| 36 // DateTimeSection | 37 // DateTimeSection |
| 37 | 38 |
| 38 // Date/Time section for datetime settings | 39 // Date/Time section for datetime settings |
| 39 class DateTimeSection : public SettingsPageSection, | 40 class DateTimeSection : public SettingsPageSection, |
| 40 public views::Combobox::Listener, | 41 public views::Combobox::Listener, |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 393 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 393 layout->StartRow(0, single_column_view_set_id); | 394 layout->StartRow(0, single_column_view_set_id); |
| 394 layout->AddView(new TouchpadSection(profile())); | 395 layout->AddView(new TouchpadSection(profile())); |
| 395 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 396 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 396 layout->StartRow(0, single_column_view_set_id); | 397 layout->StartRow(0, single_column_view_set_id); |
| 397 layout->AddView(new AccessibilitySection(profile())); | 398 layout->AddView(new AccessibilitySection(profile())); |
| 398 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 399 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 399 } | 400 } |
| 400 | 401 |
| 401 } // namespace chromeos | 402 } // namespace chromeos |
| OLD | NEW |