diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 02:56:42 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 02:56:42 +0000 |
commit | 41366f41435ebcb88d24aa35528ae8ca8466914b (patch) | |
tree | b686cb17d1fc5e36d5769e8a8ab51de7e354c5df | |
parent | 437c9ba08520459ddd1c54c052f0117ca5394cb1 (diff) | |
download | chromium_src-41366f41435ebcb88d24aa35528ae8ca8466914b.zip chromium_src-41366f41435ebcb88d24aa35528ae8ca8466914b.tar.gz chromium_src-41366f41435ebcb88d24aa35528ae8ca8466914b.tar.bz2 |
WebUI: Rename DOMUIScreenshotSource to WebUIScreenshotSource.
BUG=59945
TEST=trybots
Review URL: http://codereview.chromium.org/6322012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72923 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/dom_ui/bug_report_ui.cc | 8 | ||||
-rw-r--r-- | chrome/browser/dom_ui/web_ui_screenshot_source.cc (renamed from chrome/browser/dom_ui/dom_ui_screenshot_source.cc) | 12 | ||||
-rw-r--r-- | chrome/browser/dom_ui/web_ui_screenshot_source.h (renamed from chrome/browser/dom_ui/dom_ui_screenshot_source.h) | 15 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 4 |
4 files changed, 20 insertions, 19 deletions
diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index 9b07da8..ffbf29e 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -20,7 +20,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/bug_report_data.h" #include "chrome/browser/bug_report_util.h" -#include "chrome/browser/dom_ui/dom_ui_screenshot_source.h" +#include "chrome/browser/dom_ui/web_ui_screenshot_source.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -223,7 +223,7 @@ class BugReportHandler : public DOMMessageHandler, void CloseFeedbackTab(); TabContents* tab_; - DOMUIScreenshotSource* screenshot_source_; + WebUIScreenshotSource* screenshot_source_; BugReportData* bug_report_; std::string target_tab_url_; @@ -469,7 +469,7 @@ void BugReportHandler::ClobberScreenshotsSource() { NewRunnableMethod( ChromeURLDataManager::GetInstance(), &ChromeURLDataManager::AddDataSource, - make_scoped_refptr(new DOMUIScreenshotSource(NULL)))); + make_scoped_refptr(new WebUIScreenshotSource(NULL)))); // clobber last screenshot if (browser::last_screenshot_png) @@ -479,7 +479,7 @@ void BugReportHandler::ClobberScreenshotsSource() { void BugReportHandler::SetupScreenshotsSource() { // If we don't already have a screenshot source object created, create one. if (!screenshot_source_) - screenshot_source_ = new DOMUIScreenshotSource( + screenshot_source_ = new WebUIScreenshotSource( browser::last_screenshot_png); // Add the source to the data manager. diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc b/chrome/browser/dom_ui/web_ui_screenshot_source.cc index cf6774c..84b78e1 100644 --- a/chrome/browser/dom_ui/dom_ui_screenshot_source.cc +++ b/chrome/browser/dom_ui/web_ui_screenshot_source.cc @@ -2,7 +2,7 @@ // 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_screenshot_source.h" +#include "chrome/browser/dom_ui/web_ui_screenshot_source.h" #include "base/file_util.h" #include "base/path_service.h" @@ -69,7 +69,7 @@ std::vector<unsigned char> GetSavedScreenshot(std::string filename) { } #endif -std::vector<unsigned char> DOMUIScreenshotSource::GetScreenshot( +std::vector<unsigned char> WebUIScreenshotSource::GetScreenshot( const std::string& full_path) { // Strip the query param value - we only use it as a hack to ensure our // image gets reloaded instead of being pulled from the browser cache @@ -93,7 +93,7 @@ std::vector<unsigned char> DOMUIScreenshotSource::GetScreenshot( } } -DOMUIScreenshotSource::DOMUIScreenshotSource( +WebUIScreenshotSource::WebUIScreenshotSource( std::vector<unsigned char>* current_screenshot) : DataSource(chrome::kChromeUIScreenshotPath, MessageLoop::current()) { // Setup the last screenshot taken. @@ -103,15 +103,15 @@ DOMUIScreenshotSource::DOMUIScreenshotSource( current_screenshot_.clear(); } -DOMUIScreenshotSource::~DOMUIScreenshotSource() {} +WebUIScreenshotSource::~WebUIScreenshotSource() {} -void DOMUIScreenshotSource::StartDataRequest(const std::string& path, +void WebUIScreenshotSource::StartDataRequest(const std::string& path, bool is_off_the_record, int request_id) { SendResponse(request_id, new RefCountedBytes(GetScreenshot(path))); } -std::string DOMUIScreenshotSource::GetMimeType(const std::string&) const { +std::string WebUIScreenshotSource::GetMimeType(const std::string&) const { // We need to explicitly return a mime type, otherwise if the user tries to // drag the image they get no extension. return "image/png"; diff --git a/chrome/browser/dom_ui/dom_ui_screenshot_source.h b/chrome/browser/dom_ui/web_ui_screenshot_source.h index f677454..bc88a02 100644 --- a/chrome/browser/dom_ui/dom_ui_screenshot_source.h +++ b/chrome/browser/dom_ui/web_ui_screenshot_source.h @@ -2,8 +2,8 @@ // 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_SCREENSHOT_SOURCE_H_ -#define CHROME_BROWSER_DOM_UI_DOM_UI_SCREENSHOT_SOURCE_H_ +#ifndef CHROME_BROWSER_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_ +#define CHROME_BROWSER_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_ #include <string> #include <vector> @@ -13,9 +13,9 @@ // ScreenshotSource is the data source that serves screenshots (saved // or current) to the bug report html ui -class DOMUIScreenshotSource : public ChromeURLDataManager::DataSource { +class WebUIScreenshotSource : public ChromeURLDataManager::DataSource { public: - explicit DOMUIScreenshotSource( + explicit WebUIScreenshotSource( std::vector<unsigned char>* current_screenshot); // Called when the network layer has requested a resource underneath @@ -29,10 +29,11 @@ class DOMUIScreenshotSource : public ChromeURLDataManager::DataSource { std::vector<unsigned char> GetScreenshot(const std::string& path); private: - virtual ~DOMUIScreenshotSource(); + virtual ~WebUIScreenshotSource(); std::vector<unsigned char> current_screenshot_; - DISALLOW_COPY_AND_ASSIGN(DOMUIScreenshotSource); + + DISALLOW_COPY_AND_ASSIGN(WebUIScreenshotSource); }; -#endif // CHROME_BROWSER_DOM_UI_DOM_UI_SCREENSHOT_SOURCE_H_ +#endif // CHROME_BROWSER_DOM_UI_WEB_UI_SCREENSHOT_SOURCE_H_ diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ede2d80..3dcf629 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -867,8 +867,6 @@ 'browser/dom_ui/dom_ui_factory.h', 'browser/dom_ui/dom_ui_favicon_source.cc', 'browser/dom_ui/dom_ui_favicon_source.h', - 'browser/dom_ui/dom_ui_screenshot_source.cc', - 'browser/dom_ui/dom_ui_screenshot_source.h', 'browser/dom_ui/dom_ui_theme_source.cc', 'browser/dom_ui/dom_ui_theme_source.h', 'browser/dom_ui/dom_ui_thumbnail_source.cc', @@ -989,6 +987,8 @@ 'browser/dom_ui/tips_handler.h', 'browser/dom_ui/value_helper.cc', 'browser/dom_ui/value_helper.h', + 'browser/dom_ui/web_ui_screenshot_source.cc', + 'browser/dom_ui/web_ui_screenshot_source.h', 'browser/download/base_file.cc', 'browser/download/base_file.h', 'browser/download/download_extensions.cc', |