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

Unified Diff: chrome/browser/ui/webui/options/chromeos/wallpaper_source.h

Issue 11885021: Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: nits Created 7 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
Index: chrome/browser/ui/webui/options/chromeos/wallpaper_source.h
===================================================================
--- chrome/browser/ui/webui/options/chromeos/wallpaper_source.h (revision 176443)
+++ chrome/browser/ui/webui/options/chromeos/wallpaper_source.h (working copy)
@@ -10,18 +10,19 @@
#include "base/compiler_specific.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "content/public/browser/url_data_source_delegate.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace chromeos {
namespace options {
// A DataSource for chrome://wallpaper/ URL, provides current user's wallpaper.
-class WallpaperImageSource : public ChromeURLDataManager::DataSource {
+class WallpaperImageSource : public content::URLDataSourceDelegate {
public:
WallpaperImageSource();
- // ChromeURLDataManager::DataSource implementation.
+ // content::URLDataSourceDelegate implementation.
+ virtual std::string GetSource() OVERRIDE;
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id) OVERRIDE;
@@ -34,7 +35,9 @@
// Get wallpaper for request identified by |request_id| in UI thread
// and pass it to encoding phase.
- void GetCurrentUserWallpaper(int request_id);
+ static void GetCurrentUserWallpaper(
+ const base::WeakPtr<WallpaperImageSource>& this_object,
+ int request_id);
// Callback is called when image is obtained from UI thread to
// encode and send reply to request identified by |request_id|.

Powered by Google App Engine
This is Rietveld 408576698