chrome/browser/ui/webui/chromeos/proxy_settings_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/chromeos/proxy_settings_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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc » ('j') | chrome/browser/ui/webui/options2/advanced_options_utils.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_CHROMEOS_PROXY_SETTINGS_UI_H_	5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_

6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_	6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_

7 #pragma once	7 #pragma once

8	8

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

10 #include "content/public/browser/web_ui_controller.h"	10 #include "content/public/browser/web_ui_controller.h"

11	11

12 namespace chromeos {	12 namespace chromeos {

13	13

14 namespace options2 {	14 namespace options2 {

15 class CoreChromeOSOptionsHandler;	15 class CoreChromeOSOptionsHandler;

16 class ProxyHandler;	16 class ProxyHandler;

17 }	17 }

18	18

19 // A WebUI to host proxy settings splitted from settings page for better	19 // A WebUI to host proxy settings splitted from settings page for better

(...skipping 10 matching lines...) Expand all Loading...
30	30

31 options2::ProxyHandler* proxy_handler_; // Weak ptr.	31 options2::ProxyHandler* proxy_handler_; // Weak ptr.

32 options2::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.	32 options2::CoreChromeOSOptionsHandler* core_handler_; // WeakPtr.

33	33

34 DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);	34 DISALLOW_COPY_AND_ASSIGN(ProxySettingsUI);

35 };	35 };

36	36

37 } // namespace chromeos	37 } // namespace chromeos

38	38

39 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_	39 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_PROXY_SETTINGS_UI_H_

OLD	NEW