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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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/options/chromeos/core_chromeos_options_handler .h" 5 #include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler .h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/session/session_state_delegate.h" 11 #include "ash/session/session_state_delegate.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/prefs/pref_change_registrar.h"
16 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "base/sys_info.h" 18 #include "base/sys_info.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/chrome_notification_types.h" 20 #include "chrome/browser/chrome_notification_types.h"
22 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 21 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
23 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 22 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
24 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
25 #include "chrome/browser/chromeos/profiles/profile_helper.h" 24 #include "chrome/browser/chromeos/profiles/profile_helper.h"
26 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 25 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
27 #include "chrome/browser/chromeos/settings/cros_settings.h" 26 #include "chrome/browser/chromeos/settings/cros_settings.h"
28 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
29 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" 28 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
30 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h" 29 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
31 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
32 #include "chrome/grit/generated_resources.h" 31 #include "chrome/grit/generated_resources.h"
32 #include "components/prefs/pref_change_registrar.h"
33 #include "components/proxy_config/proxy_config_pref_names.h" 33 #include "components/proxy_config/proxy_config_pref_names.h"
34 #include "components/user_manager/user_manager.h" 34 #include "components/user_manager/user_manager.h"
35 #include "content/public/browser/notification_service.h" 35 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/user_metrics.h" 36 #include "content/public/browser/user_metrics.h"
37 #include "content/public/browser/web_ui.h" 37 #include "content/public/browser/web_ui.h"
38 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
39 39
40 namespace chromeos { 40 namespace chromeos {
41 namespace options { 41 namespace options {
42 42
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 proxy_cros_settings_parser::GetProxyPrefValue( 423 proxy_cros_settings_parser::GetProxyPrefValue(
424 proxy_config_service_, kProxySettings[i], &value); 424 proxy_config_service_, kProxySettings[i], &value);
425 DCHECK(value); 425 DCHECK(value);
426 scoped_ptr<base::Value> ptr(value); 426 scoped_ptr<base::Value> ptr(value);
427 DispatchPrefChangeNotification(kProxySettings[i], std::move(ptr)); 427 DispatchPrefChangeNotification(kProxySettings[i], std::move(ptr));
428 } 428 }
429 } 429 }
430 430
431 } // namespace options 431 } // namespace options
432 } // namespace chromeos 432 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698