chrome/browser/ui/webui/options2/browser_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/browser_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:

Index: chrome/browser/ui/webui/options2/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc

similarity index 99%

rename from chrome/browser/ui/webui/options2/browser_options_handler2.cc

rename to chrome/browser/ui/webui/options2/browser_options_handler.cc

index 30cf57df795e80ce56db42d77bf2f7605226548d..e3130d130a306e9cada1fca9712e59faa3d7d63d 100644

--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/browser_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/browser_options_handler2.h"

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

#include <string>

#include <vector>

@@ -78,7 +78,7 @@

#if !defined(OS_CHROMEOS)

#include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"

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

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

#endif

#if defined(OS_CHROMEOS)