Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: chrome/browser/dom_ui/bug_report_ui.cc

Issue 6263008: Move ResourceBundle, DataPack to ui/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/bookmarks_ui.cc ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #include "app/resource_bundle.h"
13 #include "base/callback.h" 12 #include "base/callback.h"
14 #include "base/logging.h" 13 #include "base/logging.h"
15 #include "base/message_loop.h" 14 #include "base/message_loop.h"
16 #include "base/singleton.h" 15 #include "base/singleton.h"
17 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
18 #include "base/string_piece.h" 17 #include "base/string_piece.h"
19 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
20 #include "base/values.h" 19 #include "base/values.h"
21 #include "base/weak_ptr.h" 20 #include "base/weak_ptr.h"
22 #include "chrome/browser/browser_thread.h" 21 #include "chrome/browser/browser_thread.h"
23 #include "chrome/browser/bug_report_data.h" 22 #include "chrome/browser/bug_report_data.h"
24 #include "chrome/browser/bug_report_util.h" 23 #include "chrome/browser/bug_report_util.h"
25 #include "chrome/browser/dom_ui/dom_ui_screenshot_source.h" 24 #include "chrome/browser/dom_ui/dom_ui_screenshot_source.h"
26 #include "chrome/browser/tab_contents/tab_contents.h" 25 #include "chrome/browser/tab_contents/tab_contents.h"
27 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/browser_list.h" 27 #include "chrome/browser/ui/browser_list.h"
29 #include "chrome/browser/ui/browser_window.h" 28 #include "chrome/browser/ui/browser_window.h"
30 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/jstemplate_builder.h" 30 #include "chrome/common/jstemplate_builder.h"
32 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
33 #include "gfx/rect.h" 32 #include "gfx/rect.h"
34
35 #include "grit/browser_resources.h" 33 #include "grit/browser_resources.h"
36 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
37 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
38 #include "grit/locale_settings.h" 36 #include "grit/locale_settings.h"
37 #include "ui/base/resource/resource_bundle.h"
39 38
40 #if defined(USE_X11) 39 #if defined(USE_X11)
41 #include "ui/base/x/x11_util.h" 40 #include "ui/base/x/x11_util.h"
42 #elif defined(OS_MACOSX) 41 #elif defined(OS_MACOSX)
43 #include "base/mac/mac_util.h" 42 #include "base/mac/mac_util.h"
44 #elif defined(OS_WIN) 43 #elif defined(OS_WIN)
45 #include "app/win/win_util.h" 44 #include "app/win/win_util.h"
46 #endif 45 #endif
47 46
48 #if defined(TOOLKIT_VIEWS) 47 #if defined(TOOLKIT_VIEWS)
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 BugReportUIHTMLSource* html_source = 763 BugReportUIHTMLSource* html_source =
765 new BugReportUIHTMLSource(handler->Init()); 764 new BugReportUIHTMLSource(handler->Init());
766 // Set up the chrome://bugreport/ source. 765 // Set up the chrome://bugreport/ source.
767 BrowserThread::PostTask( 766 BrowserThread::PostTask(
768 BrowserThread::IO, FROM_HERE, 767 BrowserThread::IO, FROM_HERE,
769 NewRunnableMethod( 768 NewRunnableMethod(
770 ChromeURLDataManager::GetInstance(), 769 ChromeURLDataManager::GetInstance(),
771 &ChromeURLDataManager::AddDataSource, 770 &ChromeURLDataManager::AddDataSource,
772 make_scoped_refptr(html_source))); 771 make_scoped_refptr(html_source)));
773 } 772 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/bookmarks_ui.cc ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698