Enable MSVC warning for unused locals.

chrome/browser/extensions/external_provider_impl.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.
 
 #include "chrome/browser/extensions/external_provider_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 445 matching lines @@
   // Check that all components of the path are writable by root only.
   ExternalPrefLoader::Options check_admin_permissions_on_mac;
 #if defined(OS_MACOSX)
   check_admin_permissions_on_mac =
     ExternalPrefLoader::ENSURE_PATH_CONTROLLED_BY_ADMIN;
 #else
   check_admin_permissions_on_mac = ExternalPrefLoader::NONE;
 #endif
 
   bool is_chromeos_demo_session = false;
+#if !defined(OS_WIN)
   int bundled_extension_creation_flags = Extension::NO_FLAGS;
+#endif

[Peter Kasting, 2014/11/18 00:41:03]

Note: Every change other than the couple lines above this is simply to try to
unify the various ifdef blocks a bit more, e.g.:

#if A
...
#endif
#if !A && B
...
#endif
#if A
...
#endif

->

#if A
...
...
#else if B
...
#endif

There should be no functional change.

Technically this isn't necessary for this CL but I rearranged these while trying
to figure out what conditions used |bundled_extension_creation_flags| and
thought I'd just leave the rearrangements as they're slightly more sane.

 #if defined(OS_CHROMEOS)
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   is_chromeos_demo_session =
       user_manager && user_manager->IsLoggedInAsDemoUser() &&
       connector->GetDeviceMode() == policy::DEVICE_MODE_RETAIL_KIOSK;
   bundled_extension_creation_flags = Extension::FROM_WEBSTORE |
       Extension::WAS_INSTALLED_BY_DEFAULT;
-#endif
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  if (!profile->IsSupervised()) {
-    provider_list->push_back(
-        linked_ptr<ExternalProviderInterface>(
-            new ExternalProviderImpl(
-                service,
-                new ExternalPrefLoader(
-                    chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
-                    ExternalPrefLoader::NONE,
-                    NULL),
-                profile,
-                Manifest::EXTERNAL_PREF,
-                Manifest::EXTERNAL_PREF_DOWNLOAD,
-                bundled_extension_creation_flags)));
-  }
-#endif
-
-#if defined(OS_CHROMEOS)
   if (!is_chromeos_demo_session && !is_chrome_os_public_session) {
     int external_apps_path_id = profile->IsSupervised() ?
         chrome::DIR_SUPERVISED_USERS_DEFAULT_APPS :
         chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS;
     ExternalPrefLoader::Options pref_load_flags = profile->IsNewProfile() ?
         ExternalPrefLoader::DELAY_LOAD_UNTIL_PRIORITY_SYNC :
         ExternalPrefLoader::NONE;
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(new ExternalProviderImpl(
             service,
@@ skipping 25 matching lines @@
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
           new ExternalProviderImpl(
               service,
               app_pack_updater->CreateExternalLoader(),
               profile,
               Manifest::EXTERNAL_PREF,
               Manifest::INVALID_LOCATION,
               Extension::NO_FLAGS)));
   }
+#elif defined(OS_LINUX)
+  if (!profile->IsSupervised()) {
+    provider_list->push_back(
+        linked_ptr<ExternalProviderInterface>(
+            new ExternalProviderImpl(
+                service,
+                new ExternalPrefLoader(
+                    chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
+                    ExternalPrefLoader::NONE,
+                    NULL),
+                profile,
+                Manifest::EXTERNAL_PREF,
+                Manifest::EXTERNAL_PREF_DOWNLOAD,
+                bundled_extension_creation_flags)));
+  }
 #endif
 
   if (!profile->IsSupervised() && !is_chromeos_demo_session) {
-#if !defined(OS_WIN)
+#if defined(OS_WIN)
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
             new ExternalProviderImpl(
+                service,
+                new ExternalRegistryLoader,
+                profile,
+                Manifest::EXTERNAL_REGISTRY,
+                Manifest::EXTERNAL_PREF_DOWNLOAD,
+                Extension::NO_FLAGS)));
+#else
+    provider_list->push_back(
+        linked_ptr<ExternalProviderInterface>(
+            new ExternalProviderImpl(
                 service,
                 new ExternalPrefLoader(chrome::DIR_EXTERNAL_EXTENSIONS,
                                        check_admin_permissions_on_mac,
                                        NULL),
                 profile,
                 Manifest::EXTERNAL_PREF,
                 Manifest::EXTERNAL_PREF_DOWNLOAD,
                 bundled_extension_creation_flags)));
-#endif
 
     // Define a per-user source of external extensions.
 #if defined(OS_MACOSX)
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
             new ExternalProviderImpl(
                 service,
                 new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
                                        ExternalPrefLoader::NONE,
                                        NULL),
                 profile,
                 Manifest::EXTERNAL_PREF,
                 Manifest::EXTERNAL_PREF_DOWNLOAD,
                 Extension::NO_FLAGS)));
 #endif
-
-#if defined(OS_WIN)
-    provider_list->push_back(
-        linked_ptr<ExternalProviderInterface>(
-            new ExternalProviderImpl(
-                service,
-                new ExternalRegistryLoader,
-                profile,
-                Manifest::EXTERNAL_REGISTRY,
-                Manifest::EXTERNAL_PREF_DOWNLOAD,
-                Extension::NO_FLAGS)));
 #endif
 
 #if !defined(OS_CHROMEOS)
     // The default apps are installed as INTERNAL but use the external
     // extension installer codeflow.
     provider_list->push_back(
         linked_ptr<ExternalProviderInterface>(
             new default_apps::Provider(
                 profile,
                 service,
@@ skipping 12 matching lines @@
             service,
             new ExternalComponentLoader(profile),
             profile,
             Manifest::INVALID_LOCATION,
             Manifest::EXTERNAL_COMPONENT,
             Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
   }
 }
 
 }  // namespace extensions