OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 20 matching lines...) Expand all Loading... |
31 #include "chrome/common/jstemplate_builder.h" | 31 #include "chrome/common/jstemplate_builder.h" |
32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
33 #include "gfx/rect.h" | 33 #include "gfx/rect.h" |
34 | 34 |
35 #include "grit/browser_resources.h" | 35 #include "grit/browser_resources.h" |
36 #include "grit/chromium_strings.h" | 36 #include "grit/chromium_strings.h" |
37 #include "grit/generated_resources.h" | 37 #include "grit/generated_resources.h" |
38 #include "grit/locale_settings.h" | 38 #include "grit/locale_settings.h" |
39 | 39 |
40 #if defined(USE_X11) | 40 #if defined(USE_X11) |
41 #include "app/x11_util.h" | 41 #include "ui/base/x/x11_util.h" |
42 #elif defined(OS_MACOSX) | 42 #elif defined(OS_MACOSX) |
43 #include "base/mac/mac_util.h" | 43 #include "base/mac/mac_util.h" |
44 #elif defined(OS_WIN) | 44 #elif defined(OS_WIN) |
45 #include "app/win/win_util.h" | 45 #include "app/win/win_util.h" |
46 #endif | 46 #endif |
47 | 47 |
48 #if defined(TOOLKIT_VIEWS) | 48 #if defined(TOOLKIT_VIEWS) |
49 #include "views/window/window.h" | 49 #include "views/window/window.h" |
50 #endif | 50 #endif |
51 | 51 |
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
764 BugReportUIHTMLSource* html_source = | 764 BugReportUIHTMLSource* html_source = |
765 new BugReportUIHTMLSource(handler->Init()); | 765 new BugReportUIHTMLSource(handler->Init()); |
766 // Set up the chrome://bugreport/ source. | 766 // Set up the chrome://bugreport/ source. |
767 BrowserThread::PostTask( | 767 BrowserThread::PostTask( |
768 BrowserThread::IO, FROM_HERE, | 768 BrowserThread::IO, FROM_HERE, |
769 NewRunnableMethod( | 769 NewRunnableMethod( |
770 ChromeURLDataManager::GetInstance(), | 770 ChromeURLDataManager::GetInstance(), |
771 &ChromeURLDataManager::AddDataSource, | 771 &ChromeURLDataManager::AddDataSource, |
772 make_scoped_refptr(html_source))); | 772 make_scoped_refptr(html_source))); |
773 } | 773 } |
OLD | NEW |