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

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

Issue 8727037: Signed settings refactoring: Proper caching and more tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Fixed small bugs. Rebased to ToT. Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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>
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 26 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
27 #include "chrome/browser/chromeos/cros/cros_library.h" 27 #include "chrome/browser/chromeos/cros/cros_library.h"
28 #include "chrome/browser/chromeos/cros/network_library.h" 28 #include "chrome/browser/chromeos/cros/network_library.h"
29 #include "chrome/browser/chromeos/cros_settings.h" 29 #include "chrome/browser/chromeos/cros_settings.h"
30 #include "chrome/browser/chromeos/mobile_config.h" 30 #include "chrome/browser/chromeos/mobile_config.h"
31 #include "chrome/browser/chromeos/options/network_config_view.h" 31 #include "chrome/browser/chromeos/options/network_config_view.h"
32 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 32 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
33 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 33 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
34 #include "chrome/browser/chromeos/status/network_menu_icon.h" 34 #include "chrome/browser/chromeos/status/network_menu_icon.h"
35 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
36 #include "chrome/browser/net/pref_proxy_config_tracker.h" 35 #include "chrome/browser/net/pref_proxy_config_tracker.h"
37 #include "chrome/browser/profiles/profile.h" 36 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/ui/browser.h" 37 #include "chrome/browser/ui/browser.h"
39 #include "chrome/browser/ui/browser_list.h" 38 #include "chrome/browser/ui/browser_list.h"
40 #include "chrome/browser/ui/browser_window.h" 39 #include "chrome/browser/ui/browser_window.h"
41 #include "chrome/browser/ui/dialog_style.h" 40 #include "chrome/browser/ui/dialog_style.h"
42 #include "chrome/browser/ui/views/window.h" 41 #include "chrome/browser/ui/views/window.h"
43 #include "chrome/browser/ui/webui/web_ui_util.h" 42 #include "chrome/browser/ui/webui/web_ui_util.h"
44 #include "chrome/common/chrome_notification_types.h" 43 #include "chrome/common/chrome_notification_types.h"
45 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1364 value_dict->Set("value", value); 1363 value_dict->Set("value", value);
1365 const base::Value* default_value = ui_data.default_value(); 1364 const base::Value* default_value = ui_data.default_value();
1366 if (default_value) 1365 if (default_value)
1367 value_dict->Set("default", default_value->DeepCopy()); 1366 value_dict->Set("default", default_value->DeepCopy());
1368 if (ui_data.managed()) 1367 if (ui_data.managed())
1369 value_dict->SetString("controlledBy", "policy"); 1368 value_dict->SetString("controlledBy", "policy");
1370 else if (ui_data.recommended()) 1369 else if (ui_data.recommended())
1371 value_dict->SetString("controlledBy", "recommended"); 1370 value_dict->SetString("controlledBy", "recommended");
1372 settings->Set(key, value_dict); 1371 settings->Set(key, value_dict);
1373 } 1372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698