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

Side by Side Diff: chrome/browser/ui/webui/about_ui.cc

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix Created 7 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
OLDNEW
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 <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/browser_process.h" 32 #include "chrome/browser/browser_process.h"
33 #include "chrome/browser/defaults.h" 33 #include "chrome/browser/defaults.h"
34 #include "chrome/browser/memory_details.h" 34 #include "chrome/browser/memory_details.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/profiles/profile.h" 37 #include "chrome/browser/profiles/profile.h"
38 #include "chrome/browser/profiles/profile_manager.h" 38 #include "chrome/browser/profiles/profile_manager.h"
39 #include "chrome/browser/ui/browser_dialogs.h" 39 #include "chrome/browser/ui/browser_dialogs.h"
40 #include "chrome/browser/ui/webui/web_ui_util.h" 40 #include "chrome/browser/ui/webui/web_ui_util.h"
41 #include "chrome/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/jstemplate_builder.h"
43 #include "chrome/common/render_messages.h" 42 #include "chrome/common/render_messages.h"
44 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
45 #include "content/public/browser/browser_thread.h" 44 #include "content/public/browser/browser_thread.h"
46 #include "content/public/browser/render_process_host.h" 45 #include "content/public/browser/render_process_host.h"
47 #include "content/public/browser/render_view_host.h" 46 #include "content/public/browser/render_view_host.h"
48 #include "content/public/browser/web_contents.h" 47 #include "content/public/browser/web_contents.h"
49 #include "content/public/common/content_client.h" 48 #include "content/public/common/content_client.h"
50 #include "content/public/common/process_type.h" 49 #include "content/public/common/process_type.h"
51 #include "google_apis/gaia/google_service_auth_error.h" 50 #include "google_apis/gaia/google_service_auth_error.h"
52 #include "googleurl/src/gurl.h" 51 #include "googleurl/src/gurl.h"
53 #include "grit/browser_resources.h" 52 #include "grit/browser_resources.h"
54 #include "grit/chromium_strings.h" 53 #include "grit/chromium_strings.h"
55 #include "grit/generated_resources.h" 54 #include "grit/generated_resources.h"
56 #include "grit/locale_settings.h" 55 #include "grit/locale_settings.h"
57 #include "net/base/escape.h" 56 #include "net/base/escape.h"
58 #include "net/base/net_util.h" 57 #include "net/base/net_util.h"
59 #include "ui/base/l10n/l10n_util.h" 58 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/base/resource/resource_bundle.h" 59 #include "ui/base/resource/resource_bundle.h"
60 #include "ui/webui/jstemplate_builder.h"
61 61
62 #if defined(ENABLE_THEMES) 62 #if defined(ENABLE_THEMES)
63 #include "chrome/browser/ui/webui/theme_source.h" 63 #include "chrome/browser/ui/webui/theme_source.h"
64 #endif 64 #endif
65 65
66 #if defined(OS_LINUX) || defined(OS_OPENBSD) 66 #if defined(OS_LINUX) || defined(OS_OPENBSD)
67 #include "content/public/browser/zygote_host_linux.h" 67 #include "content/public/browser/zygote_host_linux.h"
68 #include "content/public/common/sandbox_linux.h" 68 #include "content/public/common/sandbox_linux.h"
69 #endif 69 #endif
70 70
(...skipping 970 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 1041
1042 #if defined(ENABLE_THEMES) 1042 #if defined(ENABLE_THEMES)
1043 // Set up the chrome://theme/ source. 1043 // Set up the chrome://theme/ source.
1044 ThemeSource* theme = new ThemeSource(profile); 1044 ThemeSource* theme = new ThemeSource(profile);
1045 ChromeURLDataManager::AddDataSource(profile, theme); 1045 ChromeURLDataManager::AddDataSource(profile, theme);
1046 #endif 1046 #endif
1047 1047
1048 ChromeURLDataManager::AddDataSource( 1048 ChromeURLDataManager::AddDataSource(
1049 profile, new AboutUIHTMLSource(name, profile)); 1049 profile, new AboutUIHTMLSource(name, profile));
1050 } 1050 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/pdf/pdf_unsupported_feature.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698