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

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

Issue 2561013002: Remove the enable_themes build flag and define. (Closed)
Patch Set: Merge Created 4 years 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "net/http/http_response_headers.h" 64 #include "net/http/http_response_headers.h"
65 #include "net/url_request/url_fetcher.h" 65 #include "net/url_request/url_fetcher.h"
66 #include "net/url_request/url_request_status.h" 66 #include "net/url_request/url_request_status.h"
67 #include "third_party/brotli/dec/decode.h" 67 #include "third_party/brotli/dec/decode.h"
68 #include "ui/base/l10n/l10n_util.h" 68 #include "ui/base/l10n/l10n_util.h"
69 #include "ui/base/resource/resource_bundle.h" 69 #include "ui/base/resource/resource_bundle.h"
70 #include "ui/base/webui/jstemplate_builder.h" 70 #include "ui/base/webui/jstemplate_builder.h"
71 #include "ui/base/webui/web_ui_util.h" 71 #include "ui/base/webui/web_ui_util.h"
72 #include "url/gurl.h" 72 #include "url/gurl.h"
73 73
74 #if defined(ENABLE_THEMES) 74 #if !defined(OS_ANDROID)
75 #include "chrome/browser/ui/webui/theme_source.h" 75 #include "chrome/browser/ui/webui/theme_source.h"
76 #endif 76 #endif
77 77
78 #if defined(OS_LINUX) || defined(OS_OPENBSD) 78 #if defined(OS_LINUX) || defined(OS_OPENBSD)
79 #include "content/public/browser/zygote_host_linux.h" 79 #include "content/public/browser/zygote_host_linux.h"
80 #include "content/public/common/sandbox_linux.h" 80 #include "content/public/common/sandbox_linux.h"
81 #endif 81 #endif
82 82
83 #if defined(OS_WIN) 83 #if defined(OS_WIN)
84 #include "chrome/browser/win/enumerate_modules_model.h" 84 #include "chrome/browser/win/enumerate_modules_model.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 return false; 848 return false;
849 } 849 }
850 #endif 850 #endif
851 return content::URLDataSource::ShouldDenyXFrameOptions(); 851 return content::URLDataSource::ShouldDenyXFrameOptions();
852 } 852 }
853 853
854 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) 854 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name)
855 : WebUIController(web_ui) { 855 : WebUIController(web_ui) {
856 Profile* profile = Profile::FromWebUI(web_ui); 856 Profile* profile = Profile::FromWebUI(web_ui);
857 857
858 #if defined(ENABLE_THEMES) 858 #if !defined(OS_ANDROID)
859 // Set up the chrome://theme/ source. 859 // Set up the chrome://theme/ source.
860 ThemeSource* theme = new ThemeSource(profile); 860 ThemeSource* theme = new ThemeSource(profile);
861 content::URLDataSource::Add(profile, theme); 861 content::URLDataSource::Add(profile, theme);
862 #endif 862 #endif
863 863
864 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); 864 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
865 } 865 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/prefs/prefs_tab_helper.cc ('k') | chrome/browser/ui/webui/app_launcher_page_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698