Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: chrome/browser/chromeos/options/vpn_config_view.cc

Issue 29263007: linux and chromeos: Turn on -Wunused-const-variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 years, 2 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
OLDNEW
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 "ash/system/chromeos/network/network_connect.h" 7 #include "ash/system/chromeos/network/network_connect.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 21 matching lines...) Expand all
32 #include "ui/views/controls/combobox/combobox.h" 32 #include "ui/views/controls/combobox/combobox.h"
33 #include "ui/views/controls/label.h" 33 #include "ui/views/controls/label.h"
34 #include "ui/views/controls/textfield/textfield.h" 34 #include "ui/views/controls/textfield/textfield.h"
35 #include "ui/views/layout/grid_layout.h" 35 #include "ui/views/layout/grid_layout.h"
36 #include "ui/views/layout/layout_constants.h" 36 #include "ui/views/layout/layout_constants.h"
37 #include "ui/views/widget/widget.h" 37 #include "ui/views/widget/widget.h"
38 #include "ui/views/window/dialog_client_view.h" 38 #include "ui/views/window/dialog_client_view.h"
39 39
40 namespace { 40 namespace {
41 41
42 // Root CA certificates that are built into Chrome use this token name.
43 const char* const kRootCertificateTokenName = "Builtin Object Token";
44
45 enum ProviderTypeIndex { 42 enum ProviderTypeIndex {
46 PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK = 0, 43 PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK = 0,
47 PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT = 1, 44 PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT = 1,
48 PROVIDER_TYPE_INDEX_OPEN_VPN = 2, 45 PROVIDER_TYPE_INDEX_OPEN_VPN = 2,
49 PROVIDER_TYPE_INDEX_MAX = 3, 46 PROVIDER_TYPE_INDEX_MAX = 3,
50 }; 47 };
51 48
52 string16 ProviderTypeIndexToString(int index) { 49 string16 ProviderTypeIndexToString(int index) {
53 switch (index) { 50 switch (index) {
54 case PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK: 51 case PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK:
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 property_ui_data->ParseOncProperty( 1050 property_ui_data->ParseOncProperty(
1054 onc_source, 1051 onc_source,
1055 onc, 1052 onc,
1056 base::StringPrintf("%s.%s.%s", 1053 base::StringPrintf("%s.%s.%s",
1057 ::onc::network_config::kVPN, 1054 ::onc::network_config::kVPN,
1058 dict_key.c_str(), 1055 dict_key.c_str(),
1059 key.c_str())); 1056 key.c_str()));
1060 } 1057 }
1061 1058
1062 } // namespace chromeos 1059 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/offline/offline_load_page.cc ('k') | chrome/browser/chromeos/settings/device_settings_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698