[Media Gallery][Linux] Improve device media gallery names.

chrome/browser/system_monitor/media_storage_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // chrome::MediaStorageUtil implementation.
 
 #include "chrome/browser/system_monitor/media_storage_util.h"
 
 #include <vector>
 
@@ skipping 248 matching lines @@
       *device_id = device_info.device_id;
 
     FilePath sub_folder_path;
     if (device_name || relative_path) {
       bool success = FilePath(device_info.location)
           .AppendRelativePath(path, &sub_folder_path);
       DCHECK(success);
     }
 
     if (device_name) {
-#if defined(OS_CHROMEOS)
+#if defined(OS_LINUX)  // Implies OS_CHROMEOS
       *device_name = GetDisplayNameForDevice(
           notifier->GetStorageSize(device_info.location),
           sub_folder_path.value().empty() ?
               device_info.name :
               sub_folder_path.BaseName().LossyDisplayName() +
                   ASCIIToUTF16(" - ") + device_info.name);
 #else
       *device_name = device_info.name;
 #endif
     }
@@ skipping 61 matching lines @@
 
 // static
 void MediaStorageUtil::SetGetDeviceInfoFromPathFunctionForTesting(
     GetDeviceInfoFromPathFunction function) {
   g_test_get_device_info_from_path_function = function;
 }
 
 MediaStorageUtil::MediaStorageUtil() {}
 
 }  // namespace chrome