| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/options/chromeos/internet_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
| 6 | 6 |
| 7 #include <ctype.h> | 7 #include <ctype.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/bind_helpers.h" | 14 #include "base/bind_helpers.h" |
| 15 #include "base/values.h" | 15 #include "base/values.h" |
| 16 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 16 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 17 #include "chrome/browser/chromeos/mobile_config.h" | 17 #include "chrome/browser/chromeos/mobile_config.h" |
| 18 #include "chrome/browser/chromeos/options/network_config_view.h" | 18 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 19 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 19 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 20 #include "chrome/browser/chromeos/settings/cros_settings.h" | 20 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 21 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 21 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
| 22 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" | 22 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h" |
| 23 #include "chrome/browser/chromeos/ui/mobile_config_ui.h" | 23 #include "chrome/browser/chromeos/ui/mobile_config_ui.h" |
| 24 #include "chrome/browser/chromeos/ui_proxy_config_service.h" | |
| 25 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 25 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
| 27 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_stri
ngs.h" | 26 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_stri
ngs.h" |
| 28 #include "chromeos/login/login_state.h" | 27 #include "chromeos/login/login_state.h" |
| 29 #include "chromeos/network/managed_network_configuration_handler.h" | 28 #include "chromeos/network/managed_network_configuration_handler.h" |
| 30 #include "chromeos/network/network_connect.h" | 29 #include "chromeos/network/network_connect.h" |
| 31 #include "chromeos/network/network_state.h" | 30 #include "chromeos/network/network_state.h" |
| 32 #include "chromeos/network/network_state_handler.h" | 31 #include "chromeos/network/network_state_handler.h" |
| 33 #include "components/onc/onc_constants.h" | 32 #include "components/onc/onc_constants.h" |
| 34 #include "components/user_manager/user_manager.h" | 33 #include "components/user_manager/user_manager.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 if (!force_show && !network->connectable() && | 260 if (!force_show && !network->connectable() && |
| 262 enrollment::CreateDialog(service_path, GetNativeWindow())) { | 261 enrollment::CreateDialog(service_path, GetNativeWindow())) { |
| 263 return; | 262 return; |
| 264 } | 263 } |
| 265 | 264 |
| 266 NetworkConfigView::ShowInParent(network->guid(), GetNativeWindow()); | 265 NetworkConfigView::ShowInParent(network->guid(), GetNativeWindow()); |
| 267 } | 266 } |
| 268 | 267 |
| 269 } // namespace options | 268 } // namespace options |
| 270 } // namespace chromeos | 269 } // namespace chromeos |
| OLD | NEW |