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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 #include "webkit/glue/webkit_glue.h" | 69 #include "webkit/glue/webkit_glue.h" |
70 #include "webkit/plugins/webplugininfo.h" | 70 #include "webkit/plugins/webplugininfo.h" |
71 | 71 |
72 #if defined(OS_WIN) | 72 #if defined(OS_WIN) |
73 #include "chrome/browser/enumerate_modules_model_win.h" | 73 #include "chrome/browser/enumerate_modules_model_win.h" |
74 #elif defined(OS_CHROMEOS) | 74 #elif defined(OS_CHROMEOS) |
75 #include "chrome/browser/chromeos/cros/cros_library.h" | 75 #include "chrome/browser/chromeos/cros/cros_library.h" |
76 #include "chrome/browser/chromeos/cros/cryptohome_library.h" | 76 #include "chrome/browser/chromeos/cros/cryptohome_library.h" |
77 #include "chrome/browser/chromeos/cros/network_library.h" | 77 #include "chrome/browser/chromeos/cros/network_library.h" |
78 #include "chrome/browser/chromeos/customization_document.h" | 78 #include "chrome/browser/chromeos/customization_document.h" |
79 #include "chrome/browser/chromeos/dbus/cryptohome_client.h" | |
80 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" | |
81 #include "chrome/browser/chromeos/login/wizard_controller.h" | 79 #include "chrome/browser/chromeos/login/wizard_controller.h" |
82 #include "chrome/browser/chromeos/version_loader.h" | 80 #include "chrome/browser/chromeos/version_loader.h" |
83 #include "chrome/browser/oom_priority_manager.h" | 81 #include "chrome/browser/oom_priority_manager.h" |
| 82 #include "chromeos/dbus/cryptohome_client.h" |
| 83 #include "chromeos/dbus/dbus_thread_manager.h" |
84 #include "content/public/browser/zygote_host_linux.h" | 84 #include "content/public/browser/zygote_host_linux.h" |
85 #elif defined(OS_LINUX) || defined(OS_OPENBSD) | 85 #elif defined(OS_LINUX) || defined(OS_OPENBSD) |
86 #include "content/public/browser/zygote_host_linux.h" | 86 #include "content/public/browser/zygote_host_linux.h" |
87 #endif | 87 #endif |
88 | 88 |
89 #if defined(USE_ASH) | 89 #if defined(USE_ASH) |
90 #include "ash/wm/frame_painter.h" | 90 #include "ash/wm/frame_painter.h" |
91 #include "base/string_split.h" | 91 #include "base/string_split.h" |
92 #endif | 92 #endif |
93 | 93 |
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1506 } | 1506 } |
1507 | 1507 |
1508 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) | 1508 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) |
1509 : WebUIController(web_ui) { | 1509 : WebUIController(web_ui) { |
1510 Profile* profile = Profile::FromWebUI(web_ui); | 1510 Profile* profile = Profile::FromWebUI(web_ui); |
1511 ChromeURLDataManager::DataSource* source = | 1511 ChromeURLDataManager::DataSource* source = |
1512 new AboutUIHTMLSource(name, profile); | 1512 new AboutUIHTMLSource(name, profile); |
1513 if (source) | 1513 if (source) |
1514 profile->GetChromeURLDataManager()->AddDataSource(source); | 1514 profile->GetChromeURLDataManager()->AddDataSource(source); |
1515 } | 1515 } |
OLD | NEW |