| 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 29 matching lines...) Expand all Loading... |
| 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/version_info/version_info.h" | 42 #include "components/version_info/version_info.h" |
| 43 #include "content/public/browser/browser_thread.h" | 43 #include "content/public/browser/browser_thread.h" |
| 44 #include "content/public/browser/notification_service.h" | 44 #include "content/public/browser/notification_service.h" |
| 45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
| 46 #include "content/public/browser/web_ui.h" | 46 #include "content/public/browser/web_ui.h" |
| 47 #include "content/public/browser/web_ui_data_source.h" | 47 #include "content/public/browser/web_ui_data_source.h" |
| 48 #include "content/public/common/user_agent.h" | 48 #include "content/public/common/user_agent.h" |
| 49 #include "grit/components_chromium_strings.h" | 49 #include "grit/components_chromium_strings.h" |
| 50 #include "grit/components_google_chrome_strings.h" | |
| 51 #include "grit/components_strings.h" | 50 #include "grit/components_strings.h" |
| 52 #include "grit/generated_resources.h" | 51 #include "grit/generated_resources.h" |
| 53 #include "policy/policy_constants.h" | 52 #include "policy/policy_constants.h" |
| 54 #include "ui/base/l10n/l10n_util.h" | 53 #include "ui/base/l10n/l10n_util.h" |
| 55 #include "v8/include/v8.h" | 54 #include "v8/include/v8.h" |
| 56 | 55 |
| 57 #if defined(OS_CHROMEOS) | 56 #if defined(OS_CHROMEOS) |
| 58 #include "base/files/file_util_proxy.h" | 57 #include "base/files/file_util_proxy.h" |
| 59 #include "base/i18n/time_formatting.h" | 58 #include "base/i18n/time_formatting.h" |
| 60 #include "base/sys_info.h" | 59 #include "base/sys_info.h" |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 std::string url = | 648 std::string url = |
| 650 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; | 649 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; |
| 651 regulatory_info->SetString("url", url); | 650 regulatory_info->SetString("url", url); |
| 652 | 651 |
| 653 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); | 652 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); |
| 654 } | 653 } |
| 655 | 654 |
| 656 #endif // defined(OS_CHROMEOS) | 655 #endif // defined(OS_CHROMEOS) |
| 657 | 656 |
| 658 } // namespace settings | 657 } // namespace settings |
| OLD | NEW |