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/nacl_ui.h" | 5 #include "chrome/browser/ui/webui/nacl_ui.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <string> | 10 #include <string> |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "base/strings/utf_string_conversions.h" | 24 #include "base/strings/utf_string_conversions.h" |
25 #include "base/threading/sequenced_worker_pool.h" | 25 #include "base/threading/sequenced_worker_pool.h" |
26 #include "base/values.h" | 26 #include "base/values.h" |
27 #include "build/build_config.h" | 27 #include "build/build_config.h" |
28 #include "chrome/browser/plugins/plugin_prefs.h" | 28 #include "chrome/browser/plugins/plugin_prefs.h" |
29 #include "chrome/browser/profiles/profile.h" | 29 #include "chrome/browser/profiles/profile.h" |
30 #include "chrome/common/channel_info.h" | 30 #include "chrome/common/channel_info.h" |
31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
33 #include "chrome/common/url_constants.h" | 33 #include "chrome/common/url_constants.h" |
| 34 #include "chrome/grit/browser_resources.h" |
34 #include "chrome/grit/chromium_strings.h" | 35 #include "chrome/grit/chromium_strings.h" |
35 #include "chrome/grit/generated_resources.h" | 36 #include "chrome/grit/generated_resources.h" |
| 37 #include "components/strings/grit/components_strings.h" |
36 #include "components/version_info/version_info.h" | 38 #include "components/version_info/version_info.h" |
37 #include "content/public/browser/browser_thread.h" | 39 #include "content/public/browser/browser_thread.h" |
38 #include "content/public/browser/plugin_service.h" | 40 #include "content/public/browser/plugin_service.h" |
39 #include "content/public/browser/user_metrics.h" | 41 #include "content/public/browser/user_metrics.h" |
40 #include "content/public/browser/web_ui.h" | 42 #include "content/public/browser/web_ui.h" |
41 #include "content/public/browser/web_ui_data_source.h" | 43 #include "content/public/browser/web_ui_data_source.h" |
42 #include "content/public/browser/web_ui_message_handler.h" | 44 #include "content/public/browser/web_ui_message_handler.h" |
43 #include "content/public/common/webplugininfo.h" | 45 #include "content/public/common/webplugininfo.h" |
44 #include "grit/browser_resources.h" | |
45 #include "grit/components_strings.h" | |
46 #include "ui/base/l10n/l10n_util.h" | 46 #include "ui/base/l10n/l10n_util.h" |
47 | 47 |
48 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
49 #include "base/win/windows_version.h" | 49 #include "base/win/windows_version.h" |
50 #endif | 50 #endif |
51 | 51 |
52 using base::ASCIIToUTF16; | 52 using base::ASCIIToUTF16; |
53 using base::UserMetricsAction; | 53 using base::UserMetricsAction; |
54 using content::BrowserThread; | 54 using content::BrowserThread; |
55 using content::PluginService; | 55 using content::PluginService; |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 | 387 |
388 NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) { | 388 NaClUI::NaClUI(content::WebUI* web_ui) : WebUIController(web_ui) { |
389 content::RecordAction(UserMetricsAction("ViewAboutNaCl")); | 389 content::RecordAction(UserMetricsAction("ViewAboutNaCl")); |
390 | 390 |
391 web_ui->AddMessageHandler(new NaClDomHandler()); | 391 web_ui->AddMessageHandler(new NaClDomHandler()); |
392 | 392 |
393 // Set up the about:nacl source. | 393 // Set up the about:nacl source. |
394 Profile* profile = Profile::FromWebUI(web_ui); | 394 Profile* profile = Profile::FromWebUI(web_ui); |
395 content::WebUIDataSource::Add(profile, CreateNaClUIHTMLSource()); | 395 content::WebUIDataSource::Add(profile, CreateNaClUIHTMLSource()); |
396 } | 396 } |
OLD | NEW |