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

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

Unified Diff: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h ('k') | chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc

diff --git a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc

similarity index 99%

rename from chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc

rename to chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc

index ecef6d7e6dd359a6018deaf55aeccea1680455e3..0f9f6a1ba2442cdd46b1958231b0975d33248378 100644

--- a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.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/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h"

+#include "chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.h"

#include "ash/desktop_background/desktop_background_controller.h"

#include "ash/shell.h"

@@ -18,7 +18,7 @@

#include "chrome/browser/ui/browser_finder.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/chrome_select_file_policy.h"

-#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.h"

+#include "chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source.h"

#include "chrome/browser/ui/webui/web_ui_util.h"

#include "chrome/common/chrome_paths.h"

#include "content/public/browser/web_ui.h"