| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/options/advanced_page_view.h" | 5 #include "chrome/browser/views/options/advanced_page_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" |
| 7 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 8 #include "base/values.h" | 9 #include "base/values.h" |
| 9 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/views/options/advanced_contents_view.h" | 11 #include "chrome/browser/views/options/advanced_contents_view.h" |
| 11 #include "chrome/browser/views/standard_layout.h" | 12 #include "chrome/browser/views/standard_layout.h" |
| 12 #include "chrome/common/chrome_constants.h" | 13 #include "chrome/common/chrome_constants.h" |
| 13 #include "chrome/common/l10n_util.h" | |
| 14 #include "chrome/common/message_box_flags.h" | 14 #include "chrome/common/message_box_flags.h" |
| 15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 16 #include "chrome/common/pref_service.h" | 16 #include "chrome/common/pref_service.h" |
| 17 #include "chrome/views/controls/message_box_view.h" | 17 #include "chrome/views/controls/message_box_view.h" |
| 18 #include "chrome/views/controls/button/native_button.h" | 18 #include "chrome/views/controls/button/native_button.h" |
| 19 #include "chrome/views/controls/scroll_view.h" | 19 #include "chrome/views/controls/scroll_view.h" |
| 20 #include "chrome/views/grid_layout.h" | 20 #include "chrome/views/grid_layout.h" |
| 21 #include "chrome/views/window/dialog_delegate.h" | 21 #include "chrome/views/window/dialog_delegate.h" |
| 22 #include "chrome/views/window/window.h" | 22 #include "chrome/views/window/window.h" |
| 23 #include "grit/chromium_strings.h" | 23 #include "grit/chromium_strings.h" |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 179 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 180 GridLayout::USE_PREF, 0, 0); | 180 GridLayout::USE_PREF, 0, 0); |
| 181 layout->StartRow(1, single_column_view_set_id); | 181 layout->StartRow(1, single_column_view_set_id); |
| 182 layout->AddView(advanced_scroll_view_); | 182 layout->AddView(advanced_scroll_view_); |
| 183 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 183 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); |
| 184 | 184 |
| 185 layout->StartRow(0, single_column_view_set_id); | 185 layout->StartRow(0, single_column_view_set_id); |
| 186 layout->AddView(reset_to_default_button_, 1, 1, | 186 layout->AddView(reset_to_default_button_, 1, 1, |
| 187 GridLayout::TRAILING, GridLayout::CENTER); | 187 GridLayout::TRAILING, GridLayout::CENTER); |
| 188 } | 188 } |
| OLD | NEW |