OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/bug_report_ui.h" | 5 #include "chrome/browser/dom_ui/bug_report_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 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/bug_report_data.h" | 23 #include "chrome/browser/bug_report_data.h" |
24 #include "chrome/browser/bug_report_util.h" | 24 #include "chrome/browser/bug_report_util.h" |
25 #include "chrome/browser/dom_ui/dom_ui_screenshot_source.h" | 25 #include "chrome/browser/dom_ui/dom_ui_screenshot_source.h" |
26 #include "chrome/browser/tab_contents/tab_contents.h" | 26 #include "chrome/browser/tab_contents/tab_contents.h" |
27 #include "chrome/browser/ui/browser.h" | 27 #include "chrome/browser/ui/browser.h" |
28 #include "chrome/browser/ui/browser_list.h" | 28 #include "chrome/browser/ui/browser_list.h" |
29 #include "chrome/common/chrome_paths.h" | 29 #include "chrome/common/chrome_paths.h" |
30 #include "chrome/common/jstemplate_builder.h" | 30 #include "chrome/common/jstemplate_builder.h" |
31 #include "chrome/common/url_constants.h" | 31 #include "chrome/common/url_constants.h" |
32 #include "gfx/rect.h" | 32 #include "gfx/rect.h" |
33 #include "views/window/window.h" | |
34 | 33 |
35 #include "grit/browser_resources.h" | 34 #include "grit/browser_resources.h" |
36 #include "grit/chromium_strings.h" | 35 #include "grit/chromium_strings.h" |
37 #include "grit/generated_resources.h" | 36 #include "grit/generated_resources.h" |
38 #include "grit/locale_settings.h" | 37 #include "grit/locale_settings.h" |
39 | 38 |
40 #if defined(USE_X11) | 39 #if defined(USE_X11) |
41 #include "app/x11_util.h" | 40 #include "app/x11_util.h" |
42 #elif defined(OS_MACOSX) | 41 #elif defined(OS_MACOSX) |
43 #include "base/mac_util.h" | 42 #include "base/mac_util.h" |
44 #elif defined(OS_WIN) | 43 #elif defined(OS_WIN) |
45 #include "app/win_util.h" | 44 #include "app/win_util.h" |
46 #endif | 45 #endif |
47 | 46 |
| 47 #if defined(TOOLKIT_VIEWS) |
| 48 #include "views/window/window.h" |
| 49 #endif |
| 50 |
48 #if defined(OS_CHROMEOS) | 51 #if defined(OS_CHROMEOS) |
49 #include "base/file_util.h" | 52 #include "base/file_util.h" |
50 #include "base/path_service.h" | 53 #include "base/path_service.h" |
51 #include "base/waitable_event.h" | 54 #include "base/waitable_event.h" |
52 #include "chrome/browser/chromeos/cros/cros_library.h" | 55 #include "chrome/browser/chromeos/cros/cros_library.h" |
53 #include "chrome/browser/chromeos/cros/syslogs_library.h" | 56 #include "chrome/browser/chromeos/cros/syslogs_library.h" |
54 #include "chrome/browser/chromeos/login/user_manager.h" | 57 #include "chrome/browser/chromeos/login/user_manager.h" |
55 #endif | 58 #endif |
56 | 59 |
57 namespace { | 60 namespace { |
(...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
800 BugReportUIHTMLSource* html_source = | 803 BugReportUIHTMLSource* html_source = |
801 new BugReportUIHTMLSource(handler->Init()); | 804 new BugReportUIHTMLSource(handler->Init()); |
802 // Set up the chrome://bugreport/ source. | 805 // Set up the chrome://bugreport/ source. |
803 BrowserThread::PostTask( | 806 BrowserThread::PostTask( |
804 BrowserThread::IO, FROM_HERE, | 807 BrowserThread::IO, FROM_HERE, |
805 NewRunnableMethod( | 808 NewRunnableMethod( |
806 ChromeURLDataManager::GetInstance(), | 809 ChromeURLDataManager::GetInstance(), |
807 &ChromeURLDataManager::AddDataSource, | 810 &ChromeURLDataManager::AddDataSource, |
808 make_scoped_refptr(html_source))); | 811 make_scoped_refptr(html_source))); |
809 } | 812 } |
OLD | NEW |