chrome/browser/ui/webui/options2/chromeos/wallpaper_source.cc - Issue 10698140: Remove "2" suffixes from options2 code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/wallpaper_source.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h ('k') | chrome/browser/ui/webui/options2/chromeos/wallpaper_source2.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/options2/chromeos/wallpaper_source2.h"	5 #include "chrome/browser/ui/webui/options2/chromeos/wallpaper_source.h"

6	6

7 #include "ash/desktop_background/desktop_background_controller.h"	7 #include "ash/desktop_background/desktop_background_controller.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "base/synchronization/cancellation_flag.h"	9 #include "base/synchronization/cancellation_flag.h"

10 #include "base/threading/worker_pool.h"	10 #include "base/threading/worker_pool.h"

11 #include "chrome/browser/chromeos/login/user_manager.h"	11 #include "chrome/browser/chromeos/login/user_manager.h"

12 #include "chrome/common/url_constants.h"	12 #include "chrome/common/url_constants.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14 #include "grit/ui_resources.h"	14 #include "grit/ui_resources.h"

15 #include "net/base/mime_util.h"	15 #include "net/base/mime_util.h"

(...skipping 146 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 }	162 }

163	163

164 void WallpaperImageSource::SendCurrentUserWallpaper(int request_id,	164 void WallpaperImageSource::SendCurrentUserWallpaper(int request_id,

165 scoped_refptr<base::RefCountedBytes> data) {	165 scoped_refptr<base::RefCountedBytes> data) {

166 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));	166 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));

167 SendResponse(request_id, data);	167 SendResponse(request_id, data);

168 }	168 }

169	169

170 } // namespace options2	170 } // namespace options2

171 } // namespace chromeos	171 } // namespace chromeos

OLD	NEW