chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc - 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/chromeos/internet_options_handler.cc

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/advanced_options_utils.h ('K') | « chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h ('k') | chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h » ('j') | chrome/browser/ui/webui/options2/chromeos/language_chewing_handler.cc » ('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 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h"	5 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler.h"

6	6

7 #include <ctype.h>	7 #include <ctype.h>

8	8

9 #include <map>	9 #include <map>

10 #include <string>	10 #include <string>

11 #include <vector>	11 #include <vector>

12	12

13 #include "ash/shell.h"	13 #include "ash/shell.h"

14 #include "ash/shell_delegate.h"	14 #include "ash/shell_delegate.h"

15 #include "base/base64.h"	15 #include "base/base64.h"

(...skipping 1448 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1464 if (default_value)	1464 if (default_value)

1465 value_dict->Set("default", default_value->DeepCopy());	1465 value_dict->Set("default", default_value->DeepCopy());

1466 if (ui_data.managed())	1466 if (ui_data.managed())

1467 value_dict->SetString("controlledBy", "policy");	1467 value_dict->SetString("controlledBy", "policy");

1468 else if (ui_data.recommended())	1468 else if (ui_data.recommended())

1469 value_dict->SetString("controlledBy", "recommended");	1469 value_dict->SetString("controlledBy", "recommended");

1470 settings->Set(key, value_dict);	1470 settings->Set(key, value_dict);

1471 }	1471 }

1472	1472

1473 } // namespace options2	1473 } // namespace options2

OLD	NEW