chrome/browser/chromeos/options/vpn_config_view.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

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/chromeos/options/vpn_config_view.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit tests Created 8 years 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

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/chromeos/options/vpn_config_view.h"	5 #include "chrome/browser/chromeos/options/vpn_config_view.h"

6	6

7 #include "base/string_util.h"	7 #include "base/string_util.h"

8 #include "base/stringprintf.h"	8 #include "base/stringprintf.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "chrome/browser/chromeos/cros/cros_library.h"	10 #include "chrome/browser/chromeos/cros/cros_library.h"

11 #include "chrome/browser/chromeos/cros/onc_constants.h"

12 #include "chrome/browser/chromeos/enrollment_dialog_view.h"	11 #include "chrome/browser/chromeos/enrollment_dialog_view.h"

13 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

14 #include "chrome/common/net/x509_certificate_model.h"	13 #include "chrome/common/net/x509_certificate_model.h"

	14 #include "chromeos/network/onc/onc_constants.h"

15 #include "grit/chromium_strings.h"	15 #include "grit/chromium_strings.h"

16 #include "grit/generated_resources.h"	16 #include "grit/generated_resources.h"

17 #include "grit/locale_settings.h"	17 #include "grit/locale_settings.h"

18 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

19 #include "ui/base/events/event.h"	19 #include "ui/base/events/event.h"

20 #include "ui/base/l10n/l10n_util.h"	20 #include "ui/base/l10n/l10n_util.h"

21 #include "ui/base/models/combobox_model.h"	21 #include "ui/base/models/combobox_model.h"

22 #include "ui/base/resource/resource_bundle.h"	22 #include "ui/base/resource/resource_bundle.h"

23 #include "ui/views/controls/button/checkbox.h"	23 #include "ui/views/controls/button/checkbox.h"

24 #include "ui/views/controls/combobox/combobox.h"	24 #include "ui/views/controls/combobox/combobox.h"

(...skipping 885 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
910 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();	910 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();

911 const base::DictionaryValue* onc =	911 const base::DictionaryValue* onc =

912 network_library->FindOncForNetwork(network->unique_id());	912 network_library->FindOncForNetwork(network->unique_id());

913	913

914 property_ui_data->ParseOncProperty(	914 property_ui_data->ParseOncProperty(

915 network->ui_data(), onc,	915 network->ui_data(), onc,

916 base::StringPrintf("%s.%s.%s", onc::kVPN, dict_key.c_str(), key.c_str()));	916 base::StringPrintf("%s.%s.%s", onc::kVPN, dict_key.c_str(), key.c_str()));

917 }	917 }

918	918

919 } // namespace chromeos	919 } // namespace chromeos

OLD	NEW