OLD | NEW |
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/version_handler.h" | 5 #include "chrome/browser/ui/webui/version_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
11 #include "base/metrics/field_trial.h" | 11 #include "base/metrics/field_trial.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "chrome/browser/plugins/plugin_prefs.h" | 14 #include "chrome/browser/plugins/plugin_prefs.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/grit/generated_resources.h" | 16 #include "chrome/grit/generated_resources.h" |
| 17 #include "components/strings/grit/components_strings.h" |
17 #include "components/variations/active_field_trials.h" | 18 #include "components/variations/active_field_trials.h" |
18 #include "components/version_ui/version_handler_helper.h" | 19 #include "components/version_ui/version_handler_helper.h" |
19 #include "components/version_ui/version_ui_constants.h" | 20 #include "components/version_ui/version_ui_constants.h" |
20 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
21 #include "content/public/browser/plugin_service.h" | 22 #include "content/public/browser/plugin_service.h" |
22 #include "content/public/browser/web_ui.h" | 23 #include "content/public/browser/web_ui.h" |
23 #include "content/public/common/content_constants.h" | 24 #include "content/public/common/content_constants.h" |
24 #include "grit/components_strings.h" | |
25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
26 #include "url/gurl.h" | 26 #include "url/gurl.h" |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 // Retrieves the executable and profile paths on the FILE thread. | 30 // Retrieves the executable and profile paths on the FILE thread. |
31 void GetFilePaths(const base::FilePath& profile_path, | 31 void GetFilePaths(const base::FilePath& profile_path, |
32 base::string16* exec_path_out, | 32 base::string16* exec_path_out, |
33 base::string16* profile_path_out) { | 33 base::string16* profile_path_out) { |
34 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); | 34 DCHECK_CURRENTLY_ON(content::BrowserThread::FILE); |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 flash_version = info_array[i].version; | 118 flash_version = info_array[i].version; |
119 break; | 119 break; |
120 } | 120 } |
121 } | 121 } |
122 } | 122 } |
123 | 123 |
124 base::StringValue arg(flash_version); | 124 base::StringValue arg(flash_version); |
125 web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFlashVersion, arg); | 125 web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFlashVersion, arg); |
126 } | 126 } |
127 #endif // defined(ENABLE_PLUGINS) | 127 #endif // defined(ENABLE_PLUGINS) |
OLD | NEW |