| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/internet_page_view.h" | 5 #include "chrome/browser/chromeos/options/internet_page_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
| 10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
| 11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/chromeos/cros/cros_library.h" | 13 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 13 #include "chrome/browser/chromeos/options/network_config_view.h" | 14 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 14 #include "chrome/browser/chromeos/options/options_window_view.h" | 15 #include "chrome/browser/chromeos/options/options_window_view.h" |
| 15 #include "chrome/browser/chromeos/status/network_menu_button.h" | 16 #include "chrome/browser/chromeos/status/network_menu_button.h" |
| 16 #include "grit/generated_resources.h" | 17 #include "grit/generated_resources.h" |
| 17 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
| 18 #include "views/controls/button/native_button.h" | 19 #include "views/controls/button/native_button.h" |
| 19 #include "views/controls/combobox/combobox.h" | 20 #include "views/controls/combobox/combobox.h" |
| 20 #include "views/controls/image_view.h" | 21 #include "views/controls/image_view.h" |
| 21 #include "views/controls/scroll_view.h" | 22 #include "views/controls/scroll_view.h" |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 610 scroll_view_->SetBounds(GetLocalBounds(false)); | 611 scroll_view_->SetBounds(GetLocalBounds(false)); |
| 611 scroll_view_->Layout(); | 612 scroll_view_->Layout(); |
| 612 } | 613 } |
| 613 | 614 |
| 614 void InternetPageView::InitControlLayout() { | 615 void InternetPageView::InitControlLayout() { |
| 615 AddChildView(scroll_view_); | 616 AddChildView(scroll_view_); |
| 616 scroll_view_->SetContents(contents_view_); | 617 scroll_view_->SetContents(contents_view_); |
| 617 } | 618 } |
| 618 | 619 |
| 619 } // namespace chromeos | 620 } // namespace chromeos |
| OLD | NEW |