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

Side by Side Diff: chrome/browser/chromeos/cros/native_network_constants.cc

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/cros/native_network_constants.h" 5 #include "chrome/browser/chromeos/cros/native_network_constants.h"
6 #include "third_party/cros_system_api/dbus/service_constants.h" 6 #include "third_party/cros_system_api/dbus/service_constants.h"
7 7
8 namespace chromeos { 8 namespace chromeos {
9 9
10 // Format of the Carrier ID: <carrier name> (<carrier country>). 10 // Format of the Carrier ID: <carrier name> (<carrier country>).
11 const char kCarrierIdFormat[] = "%s (%s)"; 11 const char kCarrierIdFormat[] = "%s (%s)";
12 12
13 // Path of the default (shared) flimflam profile. 13 // Path of the default (shared) shill profile.
14 const char kSharedProfilePath[] = "/profile/default"; 14 const char kSharedProfilePath[] = "/profile/default";
15 15
16 const char* ConnectionTypeToString(ConnectionType type) { 16 const char* ConnectionTypeToString(ConnectionType type) {
17 switch (type) { 17 switch (type) {
18 case TYPE_UNKNOWN: 18 case TYPE_UNKNOWN:
19 break; 19 break;
20 case TYPE_ETHERNET: 20 case TYPE_ETHERNET:
21 return flimflam::kTypeEthernet; 21 return flimflam::kTypeEthernet;
22 case TYPE_WIFI: 22 case TYPE_WIFI:
23 return flimflam::kTypeWifi; 23 return flimflam::kTypeWifi;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 case PROVIDER_TYPE_OPEN_VPN: 63 case PROVIDER_TYPE_OPEN_VPN:
64 return flimflam::kProviderOpenVpn; 64 return flimflam::kProviderOpenVpn;
65 case PROVIDER_TYPE_MAX: 65 case PROVIDER_TYPE_MAX:
66 break; 66 break;
67 } 67 }
68 LOG(ERROR) << "ProviderTypeToString called with unknown type: " << type; 68 LOG(ERROR) << "ProviderTypeToString called with unknown type: " << type;
69 return flimflam::kUnknownString; 69 return flimflam::kUnknownString;
70 } 70 }
71 71
72 } // namespace chromeos 72 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/native_network_constants.h ('k') | chrome/browser/chromeos/cros/native_network_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698