Merge 68092 - Expose IsDefaultSearchProvider and SetDefaultSearchProvider by ...

chrome/renderer/external_extension.cc

 // Copyright (c) 2009 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/renderer/external_extension.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/render_view.h"
@@ skipping 28 matching lines @@
     "};";
 
 #undef SEARCH_PROVIDER_API_V1
 
 const char* const kExternalExtensionName = "v8/External";
 
 // Should the new api's "IsSearchProviderInstalled and InstallSearchProvider
 // with an extra parameter to indicate if the provider should be the default"
 // be available?
 static bool EnableSearchProviderV2() {
+#if defined(OS_WIN)
+  return true;
+#else
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSearchProviderApiV2);
+#endif
 }
 
 class ExternalExtensionWrapper : public v8::Extension {
  public:
   ExternalExtensionWrapper();
 
   // Allows v8's javascript code to call the native functions defined
   // in this class for window.external.
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
       v8::Handle<v8::String> name);
@@ skipping 85 matching lines @@
     return v8::ThrowException(v8::Exception::Error(v8::String::Empty()));
   }
   return v8::Integer::New(install.state);
 }
 
 v8::Extension* ExternalExtension::Get() {
   return new ExternalExtensionWrapper();
 }
 
 }  // namespace extensions_v8