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

Unified Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_file_browser_private_api.cc
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index b102d88d29cb271f331368962ef7438bf811f0cc..db22b12303f6317082dc547f256bf4737d1cbc88 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -61,10 +61,10 @@ const char kVolumeDevicePathNotFound[] = "Device path not found";
#ifdef OS_CHROMEOS
// Volume type strings.
-const std::string kVolumeTypeFlash = "flash";
-const std::string kVolumeTypeOptical = "optical";
-const std::string kVolumeTypeHardDrive = "hdd";
-const std::string kVolumeTypeUnknown = "undefined";
+const char kVolumeTypeFlash[] = "flash";
+const char kVolumeTypeOptical[] = "optical";
+const char kVolumeTypeHardDrive[] = "hdd";
+const char kVolumeTypeUnknown[] = "undefined";
#endif
// Internal task ids.
@@ -1491,7 +1491,7 @@ bool GetVolumeMetadataFunction::RunImpl() {
}
#ifdef OS_CHROMEOS
-const std::string& GetVolumeMetadataFunction::DeviceTypeToString(
+std::string GetVolumeMetadataFunction::DeviceTypeToString(
chromeos::DeviceType type) {
switch (type) {
case chromeos::FLASH:

Powered by Google App Engine
This is Rietveld 408576698