chrome/browser/ui/webui/options/chromeos/display_options_handler.h - Issue 10837331: Options: s/options2/options/.

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/options/chromeos/display_options_handler.h

Issue 10837331: Options: s/options2/options/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wut Created 8 years, 4 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/options/chromeos/display_options_handler.h

diff --git a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.h b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h

similarity index 88%

rename from chrome/browser/ui/webui/options2/chromeos/display_options_handler.h

rename to chrome/browser/ui/webui/options/chromeos/display_options_handler.h

index a10856b0baf5d6b179f1da3965e999b0f7c094e4..d74901be510edfb8ccf14549d00e54678b73b6c8 100644

--- a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.h

+++ b/chrome/browser/ui/webui/options/chromeos/display_options_handler.h

@@ -2,12 +2,12 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_

-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_

+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_

+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_

#include <vector>

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

+#include "chrome/browser/ui/webui/options/options_ui.h"

#include "ui/aura/display_observer.h"

namespace base {

@@ -66,4 +66,4 @@ class DisplayOptionsHandler : public ::options::OptionsPageUIHandler,

} // namespace options

} // namespace chromeos

-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_

+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_