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/about_ui.h" | 5 #include "chrome/browser/ui/webui/about_ui.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 20 matching lines...) Expand all Loading... | |
31 #include "chrome/browser/browser_process.h" | 31 #include "chrome/browser/browser_process.h" |
32 #include "chrome/browser/defaults.h" | 32 #include "chrome/browser/defaults.h" |
33 #include "chrome/browser/memory_details.h" | 33 #include "chrome/browser/memory_details.h" |
34 #include "chrome/browser/metrics/histogram_synchronizer.h" | 34 #include "chrome/browser/metrics/histogram_synchronizer.h" |
35 #include "chrome/browser/net/predictor.h" | 35 #include "chrome/browser/net/predictor.h" |
36 #include "chrome/browser/net/url_fixer_upper.h" | 36 #include "chrome/browser/net/url_fixer_upper.h" |
37 #include "chrome/browser/plugin_prefs.h" | 37 #include "chrome/browser/plugin_prefs.h" |
38 #include "chrome/browser/profiles/profile.h" | 38 #include "chrome/browser/profiles/profile.h" |
39 #include "chrome/browser/profiles/profile_manager.h" | 39 #include "chrome/browser/profiles/profile_manager.h" |
40 #include "chrome/browser/ui/browser_dialogs.h" | 40 #include "chrome/browser/ui/browser_dialogs.h" |
41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" | 41 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h" |
42 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" | 42 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" |
43 #include "chrome/common/chrome_paths.h" | 43 #include "chrome/common/chrome_paths.h" |
44 #include "chrome/common/chrome_version_info.h" | 44 #include "chrome/common/chrome_version_info.h" |
45 #include "chrome/common/jstemplate_builder.h" | 45 #include "chrome/common/jstemplate_builder.h" |
46 #include "chrome/common/net/gaia/google_service_auth_error.h" | 46 #include "chrome/common/net/gaia/google_service_auth_error.h" |
47 #include "chrome/common/render_messages.h" | 47 #include "chrome/common/render_messages.h" |
48 #include "chrome/common/url_constants.h" | 48 #include "chrome/common/url_constants.h" |
49 #include "content/public/browser/browser_thread.h" | 49 #include "content/public/browser/browser_thread.h" |
50 #include "content/public/browser/plugin_service.h" | 50 #include "content/public/browser/plugin_service.h" |
51 #include "content/public/browser/render_process_host.h" | 51 #include "content/public/browser/render_process_host.h" |
(...skipping 1452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1504 return "application/javascript"; | 1504 return "application/javascript"; |
1505 } | 1505 } |
1506 return "text/html"; | 1506 return "text/html"; |
1507 } | 1507 } |
1508 | 1508 |
1509 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) | 1509 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) |
1510 : WebUIController(web_ui) { | 1510 : WebUIController(web_ui) { |
1511 Profile* profile = Profile::FromWebUI(web_ui); | 1511 Profile* profile = Profile::FromWebUI(web_ui); |
1512 ChromeURLDataManager::DataSource* source = | 1512 ChromeURLDataManager::DataSource* source = |
1513 new AboutUIHTMLSource(name, profile); | 1513 new AboutUIHTMLSource(name, profile); |
1514 if (source) | 1514 if (source) |
Elliot Glaysher
2012/04/23 22:59:05
{ } around multiline bodies.
Kyle Horimoto
2012/04/24 00:12:37
Done.
| |
1515 profile->GetChromeURLDataManager()->AddDataSource(source); | 1515 ChromeURLDataManagerFactory::GetForProfile(profile)-> |
1516 AddDataSource(source); | |
1516 } | 1517 } |
OLD | NEW |