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

Side by Side Diff: chrome/browser/ui/webui/help/help_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/help/help_handler.h" 5 #include "chrome/browser/ui/webui/help/help_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "content/public/common/user_agent.h" 44 #include "content/public/common/user_agent.h"
45 #include "grit/components_chromium_strings.h" 45 #include "grit/components_chromium_strings.h"
46 #include "grit/components_google_chrome_strings.h" 46 #include "grit/components_google_chrome_strings.h"
47 #include "grit/components_strings.h" 47 #include "grit/components_strings.h"
48 #include "ui/base/l10n/l10n_util.h" 48 #include "ui/base/l10n/l10n_util.h"
49 #include "v8/include/v8.h" 49 #include "v8/include/v8.h"
50 50
51 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
52 #include "base/files/file_util_proxy.h" 52 #include "base/files/file_util_proxy.h"
53 #include "base/i18n/time_formatting.h" 53 #include "base/i18n/time_formatting.h"
54 #include "base/prefs/pref_service.h"
55 #include "base/sys_info.h" 54 #include "base/sys_info.h"
56 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 55 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
57 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 56 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
58 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 57 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
59 #include "chrome/browser/chromeos/profiles/profile_helper.h" 58 #include "chrome/browser/chromeos/profiles/profile_helper.h"
60 #include "chrome/browser/chromeos/settings/cros_settings.h" 59 #include "chrome/browser/chromeos/settings/cros_settings.h"
61 #include "chrome/browser/profiles/profile.h" 60 #include "chrome/browser/profiles/profile.h"
62 #include "chrome/browser/ui/webui/chromeos/image_source.h" 61 #include "chrome/browser/ui/webui/chromeos/image_source.h"
63 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h" 62 #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
64 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h" 63 #include "chrome/browser/ui/webui/help/version_updater_chromeos.h"
65 #include "chromeos/chromeos_switches.h" 64 #include "chromeos/chromeos_switches.h"
66 #include "chromeos/dbus/dbus_thread_manager.h" 65 #include "chromeos/dbus/dbus_thread_manager.h"
67 #include "chromeos/dbus/power_manager_client.h" 66 #include "chromeos/dbus/power_manager_client.h"
68 #include "chromeos/system/statistics_provider.h" 67 #include "chromeos/system/statistics_provider.h"
68 #include "components/prefs/pref_service.h"
69 #include "components/user_manager/user_manager.h" 69 #include "components/user_manager/user_manager.h"
70 #endif 70 #endif
71 71
72 using base::ListValue; 72 using base::ListValue;
73 using content::BrowserThread; 73 using content::BrowserThread;
74 74
75 namespace { 75 namespace {
76 76
77 #if defined(OS_CHROMEOS) 77 #if defined(OS_CHROMEOS)
78 78
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 } 682 }
683 683
684 void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) { 684 void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) {
685 // Remove unnecessary whitespace. 685 // Remove unnecessary whitespace.
686 web_ui()->CallJavascriptFunction( 686 web_ui()->CallJavascriptFunction(
687 "help.HelpPage.setRegulatoryLabelText", 687 "help.HelpPage.setRegulatoryLabelText",
688 base::StringValue(base::CollapseWhitespaceASCII(text, true))); 688 base::StringValue(base::CollapseWhitespaceASCII(text, true)));
689 } 689 }
690 690
691 #endif // defined(OS_CHROMEOS) 691 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/foreign_session_handler.cc ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698