diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 02:18:05 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 02:18:05 +0000 |
| commit | 89539dec77e9c1625d6616c4060b474e0ebd46bd (patch) | |
| tree | 29acfb1a6c654d790f7ca181d6669da8a3db0277 /chrome/browser/chromeos | |
| parent | bf4d7d1f03aadbe74fcf2d5a555d645e02854ab6 (diff) | |
| download | chromium_src-89539dec77e9c1625d6616c4060b474e0ebd46bd.zip chromium_src-89539dec77e9c1625d6616c4060b474e0ebd46bd.tar.gz chromium_src-89539dec77e9c1625d6616c4060b474e0ebd46bd.tar.bz2 | |
views: Move combobox directory to ui/views/controls/.
BUG=104039
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8682011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index ab620dd..4c09e36 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -17,9 +17,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/combobox/combobox.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h index 87e0222..7285c34 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.h +++ b/chrome/browser/chromeos/options/vpn_config_view.h @@ -12,8 +12,8 @@ #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/ui/select_file_dialog.h" +#include "ui/views/controls/combobox/combobox_listener.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox_listener.h" #include "views/controls/textfield/textfield_controller.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index 77d7f45..0d993de 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -15,11 +15,11 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/controls/combobox/combobox.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "views/controls/button/checkbox.h" #include "views/controls/button/image_button.h" -#include "views/controls/combobox/combobox.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h index 295dce3..8e337fa 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.h +++ b/chrome/browser/chromeos/options/wifi_config_view.h @@ -15,8 +15,8 @@ #include "chrome/browser/chromeos/cros/cert_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "ui/base/models/combobox_model.h" +#include "ui/views/controls/combobox/combobox_listener.h" #include "views/controls/button/button.h" -#include "views/controls/combobox/combobox_listener.h" #include "views/controls/textfield/textfield_controller.h" #include "views/view.h" |