summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/dom_ui/network_menu_ui.cc6
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc6
-rw-r--r--chrome/browser/dom_ui/options/options_ui.cc4
-rw-r--r--chrome/browser/dom_ui/print_preview_ui.cc4
-rw-r--r--chrome/browser/dom_ui/web_ui_theme_source.cc (renamed from chrome/browser/dom_ui/dom_ui_theme_source.cc)20
-rw-r--r--chrome/browser/dom_ui/web_ui_theme_source.h (renamed from chrome/browser/dom_ui/dom_ui_theme_source.h)16
-rw-r--r--chrome/browser/dom_ui/web_ui_theme_source_unittest.cc (renamed from chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc)8
-rw-r--r--chrome/chrome_browser.gypi4
-rw-r--r--chrome/chrome_tests.gypi2
9 files changed, 35 insertions, 35 deletions
diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
index 70ba4d3..ec8a567 100644
--- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,7 @@
#include "chrome/browser/chromeos/status/network_menu.h"
#include "chrome/browser/chromeos/views/domui_menu_widget.h"
#include "chrome/browser/chromeos/views/native_menu_domui.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/gurl.h"
@@ -117,7 +117,7 @@ NetworkMenuUI::NetworkMenuUI(TabContents* contents)
AddMessageHandler((handler)->Attach(this));
// Set up chrome://theme/ source.
- DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
+ WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
NewRunnableMethod(
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index a338d25..6fc47a2 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -18,7 +18,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/dom_ui/app_launcher_handler.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/dom_ui/foreign_session_handler.h"
#include "chrome/browser/dom_ui/most_visited_handler.h"
#include "chrome/browser/dom_ui/new_tab_page_sync_handler.h"
@@ -27,6 +26,7 @@
#include "chrome/browser/dom_ui/shown_sections_handler.h"
#include "chrome/browser/dom_ui/tips_handler.h"
#include "chrome/browser/dom_ui/value_helper.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -422,7 +422,7 @@ void NewTabUI::Observe(NotificationType type,
}
void NewTabUI::InitializeCSSCaches() {
- DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
+ WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
NewRunnableMethod(
diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc
index 001edda..d56875bb 100644
--- a/chrome/browser/dom_ui/options/options_ui.cc
+++ b/chrome/browser/dom_ui/options/options_ui.cc
@@ -18,7 +18,6 @@
#include "base/values.h"
#include "chrome/browser/browser_about_handler.h"
#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/dom_ui/options/about_page_handler.h"
#include "chrome/browser/dom_ui/options/add_startup_page_handler.h"
#include "chrome/browser/dom_ui/options/advanced_options_handler.h"
@@ -35,6 +34,7 @@
#include "chrome/browser/dom_ui/options/personal_options_handler.h"
#include "chrome/browser/dom_ui/options/search_engine_manager_handler.h"
#include "chrome/browser/dom_ui/options/stop_syncing_handler.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/profiles/profile.h"
@@ -195,7 +195,7 @@ OptionsUI::OptionsUI(TabContents* contents)
make_scoped_refptr(html_source)));
// Set up the chrome://theme/ source.
- DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
+ WebUIThemeSource* theme = new WebUIThemeSource(GetProfile());
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
NewRunnableMethod(
diff --git a/chrome/browser/dom_ui/print_preview_ui.cc b/chrome/browser/dom_ui/print_preview_ui.cc
index 5f9602f..5b94c6a 100644
--- a/chrome/browser/dom_ui/print_preview_ui.cc
+++ b/chrome/browser/dom_ui/print_preview_ui.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,8 +12,8 @@
#include "base/values.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/dom_ui/print_preview_handler.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/web_ui_theme_source.cc
index 808712d..b91ab6a 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.cc
+++ b/chrome/browser/dom_ui/web_ui_theme_source.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "base/message_loop.h"
#include "base/ref_counted_memory.h"
@@ -27,19 +27,19 @@ static std::string StripQueryParams(const std::string& path) {
}
////////////////////////////////////////////////////////////////////////////////
-// DOMUIThemeSource, public:
+// WebUIThemeSource, public:
-DOMUIThemeSource::DOMUIThemeSource(Profile* profile)
+WebUIThemeSource::WebUIThemeSource(Profile* profile)
: DataSource(chrome::kChromeUIThemePath, MessageLoop::current()),
profile_(profile->GetOriginalProfile()) {
css_bytes_ = profile_->GetNTPResourceCache()->GetNewTabCSS(
profile->IsOffTheRecord());
}
-DOMUIThemeSource::~DOMUIThemeSource() {
+WebUIThemeSource::~WebUIThemeSource() {
}
-void DOMUIThemeSource::StartDataRequest(const std::string& path,
+void WebUIThemeSource::StartDataRequest(const std::string& path,
bool is_off_the_record,
int request_id) {
// Our path may include cachebuster arguments, so trim them off.
@@ -64,7 +64,7 @@ void DOMUIThemeSource::StartDataRequest(const std::string& path,
SendResponse(request_id, NULL);
}
-std::string DOMUIThemeSource::GetMimeType(const std::string& path) const {
+std::string WebUIThemeSource::GetMimeType(const std::string& path) const {
std::string uncached_path = StripQueryParams(path);
if (uncached_path == kNewTabCSSPath ||
@@ -75,7 +75,7 @@ std::string DOMUIThemeSource::GetMimeType(const std::string& path) const {
return "image/png";
}
-MessageLoop* DOMUIThemeSource::MessageLoopForRequestPath(
+MessageLoop* WebUIThemeSource::MessageLoopForRequestPath(
const std::string& path) const {
std::string uncached_path = StripQueryParams(path);
@@ -95,9 +95,9 @@ MessageLoop* DOMUIThemeSource::MessageLoopForRequestPath(
}
////////////////////////////////////////////////////////////////////////////////
-// DOMUIThemeSource, private:
+// WebUIThemeSource, private:
-void DOMUIThemeSource::SendThemeBitmap(int request_id, int resource_id) {
+void WebUIThemeSource::SendThemeBitmap(int request_id, int resource_id) {
if (BrowserThemeProvider::IsThemeableImage(resource_id)) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
ui::ThemeProvider* tp = profile_->GetThemeProvider();
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.h b/chrome/browser/dom_ui/web_ui_theme_source.h
index 2d55aaa..4a7e2ed 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.h
+++ b/chrome/browser/dom_ui/web_ui_theme_source.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
-#define CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
+#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_THEME_SOURCE_H_
+#define CHROME_BROWSER_DOM_UI_WEB_UI_THEME_SOURCE_H_
#pragma once
#include <string>
@@ -13,9 +13,9 @@
class Profile;
class RefCountedBytes;
-class DOMUIThemeSource : public ChromeURLDataManager::DataSource {
+class WebUIThemeSource : public ChromeURLDataManager::DataSource {
public:
- explicit DOMUIThemeSource(Profile* profile);
+ explicit WebUIThemeSource(Profile* profile);
// Called when the network layer has requested a resource underneath
// the path we registered.
@@ -28,7 +28,7 @@ class DOMUIThemeSource : public ChromeURLDataManager::DataSource {
virtual MessageLoop* MessageLoopForRequestPath(const std::string& path) const;
protected:
- virtual ~DOMUIThemeSource();
+ virtual ~WebUIThemeSource();
private:
// Fetch and send the theme bitmap.
@@ -40,7 +40,7 @@ class DOMUIThemeSource : public ChromeURLDataManager::DataSource {
// We grab the CSS early so we don't have to go back to the UI thread later.
scoped_refptr<RefCountedBytes> css_bytes_;
- DISALLOW_COPY_AND_ASSIGN(DOMUIThemeSource);
+ DISALLOW_COPY_AND_ASSIGN(WebUIThemeSource);
};
-#endif // CHROME_BROWSER_DOM_UI_DOM_UI_THEME_SOURCE_H_
+#endif // CHROME_BROWSER_DOM_UI_WEB_UI_THEME_SOURCE_H_
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/web_ui_theme_source_unittest.cc
index fb7a0ad..912d76c 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
+++ b/chrome/browser/dom_ui/web_ui_theme_source_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "base/ref_counted_memory.h"
#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
+#include "chrome/browser/dom_ui/web_ui_theme_source.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/themes/browser_theme_provider.h"
#include "chrome/common/url_constants.h"
@@ -13,10 +13,10 @@
#include "testing/gtest/include/gtest/gtest.h"
// A mock ThemeSource (so we can override SendResponse to get at its data).
-class MockThemeSource : public DOMUIThemeSource {
+class MockThemeSource : public WebUIThemeSource {
public:
explicit MockThemeSource(Profile* profile)
- : DOMUIThemeSource(profile),
+ : WebUIThemeSource(profile),
result_request_id_(-1),
result_data_size_(0) {
}
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7f5e080..32e0fe0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -861,8 +861,6 @@
'browser/dom_ui/devtools_ui.h',
'browser/dom_ui/dom_ui.cc',
'browser/dom_ui/dom_ui.h',
- 'browser/dom_ui/dom_ui_theme_source.cc',
- 'browser/dom_ui/dom_ui_theme_source.h',
'browser/dom_ui/downloads_dom_handler.cc',
'browser/dom_ui/downloads_dom_handler.h',
'browser/dom_ui/downloads_ui.cc',
@@ -981,6 +979,8 @@
'browser/dom_ui/web_ui_favicon_source.h',
'browser/dom_ui/web_ui_screenshot_source.cc',
'browser/dom_ui/web_ui_screenshot_source.h',
+ 'browser/dom_ui/web_ui_theme_source.cc',
+ 'browser/dom_ui/web_ui_theme_source.h',
'browser/dom_ui/web_ui_thumbnail_source.cc',
'browser/dom_ui/web_ui_thumbnail_source.h',
'browser/dom_ui/web_ui_util.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 506df1c..b636d8c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1168,12 +1168,12 @@
'browser/cookies_tree_model_unittest.cc',
'browser/debugger/devtools_manager_unittest.cc',
'browser/device_orientation/provider_unittest.cc',
- 'browser/dom_ui/dom_ui_theme_source_unittest.cc',
'browser/dom_ui/dom_ui_unittest.cc',
'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc',
'browser/dom_ui/options/language_options_handler_unittest.cc',
'browser/dom_ui/shown_sections_handler_unittest.cc',
'browser/dom_ui/sync_internals_ui_unittest.cc',
+ 'browser/dom_ui/web_ui_theme_source_unittest.cc',
'browser/download/base_file_unittest.cc',
'browser/download/download_manager_unittest.cc',
'browser/download/download_request_infobar_delegate_unittest.cc',
generated by cgit v1.1 at 2025-01-17 22:11:11 +0000