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

Unified Diff: chrome/browser/dom_ui/dom_ui_theme_source.cc

Issue 6257006: Move a bunch of random other files to src/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/dom_ui/bug_report_ui.cc ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/dom_ui_theme_source.cc
===================================================================
--- chrome/browser/dom_ui/dom_ui_theme_source.cc (revision 71854)
+++ chrome/browser/dom_ui/dom_ui_theme_source.cc (working copy)
@@ -5,7 +5,6 @@
#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "app/resource_bundle.h"
-#include "app/theme_provider.h"
#include "base/message_loop.h"
#include "base/ref_counted_memory.h"
#include "chrome/browser/browser_thread.h"
@@ -15,6 +14,7 @@
#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/gurl.h"
+#include "ui/base/theme_provider.h"
// use a resource map rather than hard-coded strings.
static const char* kNewTabCSSPath = "css/newtab.css";
@@ -100,7 +100,7 @@
void DOMUIThemeSource::SendThemeBitmap(int request_id, int resource_id) {
if (BrowserThemeProvider::IsThemeableImage(resource_id)) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ThemeProvider* tp = profile_->GetThemeProvider();
+ ui::ThemeProvider* tp = profile_->GetThemeProvider();
DCHECK(tp);
scoped_refptr<RefCountedMemory> image_data(tp->GetRawData(resource_id));
« no previous file with comments | « chrome/browser/dom_ui/bug_report_ui.cc ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698