Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/options2/chromeos/internet_options_handler.h" 5 #include "chrome/browser/ui/webui/options2/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>
(...skipping 11 matching lines...) Expand all
22 #include "base/string_number_conversions.h" 22 #include "base/string_number_conversions.h"
23 #include "base/stringprintf.h" 23 #include "base/stringprintf.h"
24 #include "base/time.h" 24 #include "base/time.h"
25 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
26 #include "base/values.h" 26 #include "base/values.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 28 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
29 #include "chrome/browser/chromeos/cros/cros_library.h" 29 #include "chrome/browser/chromeos/cros/cros_library.h"
30 #include "chrome/browser/chromeos/cros/network_library.h" 30 #include "chrome/browser/chromeos/cros/network_library.h"
31 #include "chrome/browser/chromeos/cros/onc_constants.h" 31 #include "chrome/browser/chromeos/cros/onc_constants.h"
32 #include "chrome/browser/chromeos/cros_settings.h"
33 #include "chrome/browser/chromeos/enrollment_dialog_view.h" 32 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
34 #include "chrome/browser/chromeos/mobile_config.h" 33 #include "chrome/browser/chromeos/mobile_config.h"
35 #include "chrome/browser/chromeos/options/network_config_view.h" 34 #include "chrome/browser/chromeos/options/network_config_view.h"
36 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 35 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
36 #include "chrome/browser/chromeos/settings/cros_settings.h"
37 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 37 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
38 #include "chrome/browser/chromeos/status/network_menu_icon.h" 38 #include "chrome/browser/chromeos/status/network_menu_icon.h"
39 #include "chrome/browser/net/pref_proxy_config_tracker.h" 39 #include "chrome/browser/net/pref_proxy_config_tracker.h"
40 #include "chrome/browser/profiles/profile.h" 40 #include "chrome/browser/profiles/profile.h"
41 #include "chrome/browser/profiles/profile_manager.h" 41 #include "chrome/browser/profiles/profile_manager.h"
42 #include "chrome/browser/ui/browser.h" 42 #include "chrome/browser/ui/browser.h"
43 #include "chrome/browser/ui/browser_finder.h" 43 #include "chrome/browser/ui/browser_finder.h"
44 #include "chrome/browser/ui/browser_window.h" 44 #include "chrome/browser/ui/browser_window.h"
45 #include "chrome/browser/ui/singleton_tabs.h" 45 #include "chrome/browser/ui/singleton_tabs.h"
46 #include "chrome/browser/ui/webui/web_ui_util.h" 46 #include "chrome/browser/ui/webui/web_ui_util.h"
47 #include "chrome/common/chrome_notification_types.h" 47 #include "chrome/common/chrome_notification_types.h"
48 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
49 #include "chrome/common/time_format.h" 49 #include "chrome/common/time_format.h"
50 #include "content/public/browser/notification_service.h" 50 #include "content/public/browser/notification_service.h"
51 #include "content/public/browser/web_contents.h" 51 #include "content/public/browser/web_contents.h"
52 #include "content/public/browser/web_ui.h" 52 #include "content/public/browser/web_ui.h"
53 #include "grit/chromium_strings.h" 53 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 54 #include "grit/generated_resources.h"
55 #include "grit/locale_settings.h" 55 #include "grit/locale_settings.h"
56 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
57 #include "ui/base/l10n/l10n_util.h"
57 #include "ui/base/layout.h" 58 #include "ui/base/layout.h"
58 #include "ui/base/l10n/l10n_util.h"
59 #include "ui/base/resource/resource_bundle.h" 59 #include "ui/base/resource/resource_bundle.h"
60 #include "ui/gfx/display.h" 60 #include "ui/gfx/display.h"
61 #include "ui/gfx/image/image_skia.h" 61 #include "ui/gfx/image/image_skia.h"
62 #include "ui/gfx/screen.h" 62 #include "ui/gfx/screen.h"
63 #include "ui/views/widget/widget.h" 63 #include "ui/views/widget/widget.h"
64 64
65 namespace { 65 namespace {
66 66
67 static const char kOtherNetworksFakePath[] = "?"; 67 static const char kOtherNetworksFakePath[] = "?";
68 68
(...skipping 1395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1464 if (default_value) 1464 if (default_value)
1465 value_dict->Set("default", default_value->DeepCopy()); 1465 value_dict->Set("default", default_value->DeepCopy());
1466 if (ui_data.managed()) 1466 if (ui_data.managed())
1467 value_dict->SetString("controlledBy", "policy"); 1467 value_dict->SetString("controlledBy", "policy");
1468 else if (ui_data.recommended()) 1468 else if (ui_data.recommended())
1469 value_dict->SetString("controlledBy", "recommended"); 1469 value_dict->SetString("controlledBy", "recommended");
1470 settings->Set(key, value_dict); 1470 settings->Set(key, value_dict);
1471 } 1471 }
1472 1472
1473 } // namespace options2 1473 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698