Enable Google Now By Default

chrome/browser/extensions/component_loader.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/component_loader.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 488 matching lines @@
     Add(IDR_CHROMEVOX_MANIFEST, path);
   }
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(ENABLE_GOOGLE_NOW)
   const char kEnablePrefix[] = "Enable";
   const char kFieldTrialName[] = "GoogleNow";
   std::string enable_prefix(kEnablePrefix);
   std::string field_trial_result =
       base::FieldTrialList::FindFullName(kFieldTrialName);
-  if ((field_trial_result.compare(
+  if (((field_trial_result.compare(
           0,
           enable_prefix.length(),
-          enable_prefix) == 0) ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
+          enable_prefix) == 0) &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableGoogleNowIntegration)) ||
+       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableGoogleNowIntegration)) {
     Add(IDR_GOOGLE_NOW_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("google_now")));
   }
 #endif
 }
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions