chrome/browser/ui/webui/options2/options_ui.h - 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/options_ui.h

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

Patch Set: fix tests 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

« chrome/browser/ui/webui/options2/language_options_handler_common.h ('K') | « chrome/browser/ui/webui/options2/options_browsertest.js ('k') | chrome/browser/ui/webui/options2/options_ui.cc » ('j') | chrome/browser/ui/webui/options2/web_intents_settings_handler.h » ('J')
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 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_

6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_	6 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_

7 #pragma once	7 #pragma once

8	8

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/compiler_specific.h"	12 #include "base/compiler_specific.h"

13 #include "base/memory/scoped_ptr.h"	13 #include "base/memory/scoped_ptr.h"

14 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"	14 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

15 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

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

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
132 #if defined(OS_CHROMEOS)	132 #if defined(OS_CHROMEOS)

133 scoped_ptr<chromeos::system::PointerDeviceObserver>	133 scoped_ptr<chromeos::system::PointerDeviceObserver>

134 pointer_device_observer_;	134 pointer_device_observer_;

135 #endif	135 #endif

136	136

137 DISALLOW_COPY_AND_ASSIGN(OptionsUI);	137 DISALLOW_COPY_AND_ASSIGN(OptionsUI);

138 };	138 };

139	139

140 } // namespace options2	140 } // namespace options2

141	141

142 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_	142 #endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI_H_

OLD	NEW