chrome/browser/ui/webui/options/chromeos/change_picture_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/change_picture_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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.h

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

similarity index 93%

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

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

index acbcd2d866eac2f97814e797c7ba3bb3c37a921f..4248e1b86712a631024cfefe6a227f8718054c9a 100644

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

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

@@ -2,13 +2,13 @@

// 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_CHANGE_PICTURE_OPTIONS_HANDLER_H_

-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_

+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_

+#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_

#include "base/memory/weak_ptr.h"

#include "chrome/browser/chromeos/options/take_photo_dialog.h"

#include "chrome/browser/image_decoder.h"

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

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

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

#include "ui/base/dialogs/select_file_dialog.h"

#include "ui/gfx/image/image_skia.h"

@@ -133,4 +133,4 @@ class ChangePictureOptionsHandler : public ::options::OptionsPageUIHandler,

} // namespace options

} // namespace chromeos

-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_

+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CHANGE_PICTURE_OPTIONS_HANDLER_H_