OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/settings/about_handler.h" | 5 #include "chrome/browser/ui/webui/settings/about_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "chrome/browser/ui/chrome_pages.h" | 33 #include "chrome/browser/ui/chrome_pages.h" |
34 #include "chrome/common/channel_info.h" | 34 #include "chrome/common/channel_info.h" |
35 #include "chrome/common/chrome_content_client.h" | 35 #include "chrome/common/chrome_content_client.h" |
36 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
37 #include "chrome/common/url_constants.h" | 37 #include "chrome/common/url_constants.h" |
38 #include "chrome/grit/chromium_strings.h" | 38 #include "chrome/grit/chromium_strings.h" |
39 #include "chrome/grit/generated_resources.h" | 39 #include "chrome/grit/generated_resources.h" |
40 #include "components/google/core/browser/google_util.h" | 40 #include "components/google/core/browser/google_util.h" |
41 #include "components/policy/core/common/policy_namespace.h" | 41 #include "components/policy/core/common/policy_namespace.h" |
42 #include "components/policy/policy_constants.h" | 42 #include "components/policy/policy_constants.h" |
| 43 #include "components/strings/grit/components_chromium_strings.h" |
| 44 #include "components/strings/grit/components_strings.h" |
43 #include "components/version_info/version_info.h" | 45 #include "components/version_info/version_info.h" |
44 #include "content/public/browser/browser_thread.h" | 46 #include "content/public/browser/browser_thread.h" |
45 #include "content/public/browser/notification_service.h" | 47 #include "content/public/browser/notification_service.h" |
46 #include "content/public/browser/web_contents.h" | 48 #include "content/public/browser/web_contents.h" |
47 #include "content/public/browser/web_ui.h" | 49 #include "content/public/browser/web_ui.h" |
48 #include "content/public/browser/web_ui_data_source.h" | 50 #include "content/public/browser/web_ui_data_source.h" |
49 #include "content/public/common/user_agent.h" | 51 #include "content/public/common/user_agent.h" |
50 #include "grit/components_chromium_strings.h" | |
51 #include "grit/components_strings.h" | |
52 #include "grit/generated_resources.h" | |
53 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
54 #include "v8/include/v8.h" | 53 #include "v8/include/v8.h" |
55 | 54 |
56 #if defined(OS_CHROMEOS) | 55 #if defined(OS_CHROMEOS) |
57 #include "base/files/file_util_proxy.h" | 56 #include "base/files/file_util_proxy.h" |
58 #include "base/i18n/time_formatting.h" | 57 #include "base/i18n/time_formatting.h" |
59 #include "base/sys_info.h" | 58 #include "base/sys_info.h" |
60 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" | 59 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" |
61 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" | 60 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
ory.h" |
62 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 61 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 std::string url = | 647 std::string url = |
649 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; | 648 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; |
650 regulatory_info->SetString("url", url); | 649 regulatory_info->SetString("url", url); |
651 | 650 |
652 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); | 651 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); |
653 } | 652 } |
654 | 653 |
655 #endif // defined(OS_CHROMEOS) | 654 #endif // defined(OS_CHROMEOS) |
656 | 655 |
657 } // namespace settings | 656 } // namespace settings |
OLD | NEW |