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

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

Issue 10830051: Restore <img> src values now that grit converts these. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ensure ThemeSource is loaded. Created 8 years, 4 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 23 matching lines...) Expand all
34 #include "chrome/browser/defaults.h" 34 #include "chrome/browser/defaults.h"
35 #include "chrome/browser/memory_details.h" 35 #include "chrome/browser/memory_details.h"
36 #include "chrome/browser/net/predictor.h" 36 #include "chrome/browser/net/predictor.h"
37 #include "chrome/browser/net/url_fixer_upper.h" 37 #include "chrome/browser/net/url_fixer_upper.h"
38 #include "chrome/browser/plugin_prefs.h" 38 #include "chrome/browser/plugin_prefs.h"
39 #include "chrome/browser/profiles/profile.h" 39 #include "chrome/browser/profiles/profile.h"
40 #include "chrome/browser/profiles/profile_manager.h" 40 #include "chrome/browser/profiles/profile_manager.h"
41 #include "chrome/browser/ui/browser_dialogs.h" 41 #include "chrome/browser/ui/browser_dialogs.h"
42 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 42 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
43 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" 43 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
44 #include "chrome/browser/ui/webui/theme_source.h"
44 #include "chrome/common/chrome_paths.h" 45 #include "chrome/common/chrome_paths.h"
45 #include "chrome/common/chrome_version_info.h" 46 #include "chrome/common/chrome_version_info.h"
46 #include "chrome/common/jstemplate_builder.h" 47 #include "chrome/common/jstemplate_builder.h"
47 #include "chrome/common/net/gaia/google_service_auth_error.h" 48 #include "chrome/common/net/gaia/google_service_auth_error.h"
48 #include "chrome/common/render_messages.h" 49 #include "chrome/common/render_messages.h"
49 #include "chrome/common/url_constants.h" 50 #include "chrome/common/url_constants.h"
50 #include "content/public/browser/browser_thread.h" 51 #include "content/public/browser/browser_thread.h"
51 #include "content/public/browser/plugin_service.h" 52 #include "content/public/browser/plugin_service.h"
52 #include "content/public/browser/render_process_host.h" 53 #include "content/public/browser/render_process_host.h"
53 #include "content/public/browser/render_view_host.h" 54 #include "content/public/browser/render_view_host.h"
(...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 path == kVersionJsPath || 1375 path == kVersionJsPath ||
1375 path == kMemoryJsPath) { 1376 path == kMemoryJsPath) {
1376 return "application/javascript"; 1377 return "application/javascript";
1377 } 1378 }
1378 return "text/html"; 1379 return "text/html";
1379 } 1380 }
1380 1381
1381 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) 1382 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
1382 : WebUIController(web_ui) { 1383 : WebUIController(web_ui) {
1383 Profile* profile = Profile::FromWebUI(web_ui); 1384 Profile* profile = Profile::FromWebUI(web_ui);
1385
1386 // Set up the chrome://theme/ source.
Ted C 2012/07/27 18:18:45 Android doesn't support themes, so can you wrap th
flackr 2012/07/27 18:38:46 Done.
1387 ThemeSource* theme = new ThemeSource(profile);
1388 ChromeURLDataManager::AddDataSource(profile, theme);
1389
1384 ChromeURLDataManager::DataSource* source = 1390 ChromeURLDataManager::DataSource* source =
1385 new AboutUIHTMLSource(name, profile); 1391 new AboutUIHTMLSource(name, profile);
1386 if (source) { 1392 if (source) {
1387 ChromeURLDataManager::AddDataSource(profile, source); 1393 ChromeURLDataManager::AddDataSource(profile, source);
1388 } 1394 }
1389 } 1395 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698