Revert of Move ObjectContentType entirely to HTMLPlugInElement

third_party/WebKit/Source/core/html/HTMLPlugInElement.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 88 matching lines @@
                                             const AtomicString&,
                                             MutableStylePropertySet*) override;
 
   virtual bool HasFallbackContent() const;
   virtual bool UseFallbackContent() const;
   // Create or update the LayoutEmbeddedContent and return it, triggering layout
   // if necessary.
   virtual LayoutEmbeddedContent* LayoutEmbeddedContentForJSBindings() const;
 
   bool IsImageType();
+  bool ShouldPreferPlugInsForImages() const {
+    return should_prefer_plug_ins_for_images_;
+  }
   LayoutEmbeddedItem GetLayoutEmbeddedItem() const;
   bool AllowedToLoadFrameURL(const String& url);
-  bool RequestObject(const Vector<String>& param_names,
+  bool RequestObject(const String& url,
+                     const String& mime_type,
+                     const Vector<String>& param_names,
                      const Vector<String>& param_values);
+  bool ShouldUsePlugin(const KURL&,
+                       const String& mime_type,
+                       bool has_fallback,
+                       bool& use_fallback);
 
   void DispatchErrorEvent();
   bool IsErrorplaceholder();
   void LazyReattachIfNeeded();
 
   String service_type_;
   String url_;
   KURL loaded_url_;
   Member<HTMLImageLoader> image_loader_;
   bool is_delaying_load_event_;
@@ skipping 34 matching lines @@
                   const String& mime_type,
                   const Vector<String>& param_names,
                   const Vector<String>& param_values,
                   bool use_fallback,
                   bool require_layout_object);
   // Perform checks after we have determined that a plugin will be used to
   // show the object (i.e after allowedToLoadObject).
   bool AllowedToLoadPlugin(const KURL&, const String& mime_type);
   // Perform checks based on the URL and MIME-type of the object to load.
   bool AllowedToLoadObject(const KURL&, const String& mime_type);
-
-  enum class ObjectContentType {
-    kNone,
-    kImage,
-    kFrame,
-    kPlugin,
-  };
-  ObjectContentType GetObjectContentType();
+  bool WouldLoadAsNetscapePlugin(const String& url, const String& service_type);
 
   void SetPersistedPlugin(PluginView*);
 
-  bool RequestObjectInternal(const Vector<String>& param_names,
+  bool RequestObjectInternal(const String& url,
+                             const String& mime_type,
+                             const Vector<String>& param_names,
                              const Vector<String>& param_values);
 
   v8::Global<v8::Object> plugin_wrapper_;
   bool needs_plugin_update_;
   bool should_prefer_plug_ins_for_images_;
   // Represents |layoutObject() && layoutObject()->isEmbeddedObject() &&
   // !layoutEmbeddedItem().showsUnavailablePluginIndicator()|.  We want to
   // avoid accessing |layoutObject()| in layoutObjectIsFocusable().
   bool plugin_is_available_ = false;
 
   // Normally the plugin is stored in
   // HTMLFrameOwnerElement::embedded_content_view. However, plugins can persist
   // even when not rendered. In order to prevent confusing code which may assume
   // that OwnedEmbeddedContentView() != null means the frame is active, we save
   // off embedded_content_view_ here while the plugin is persisting but not
   // being displayed.
   Member<PluginView> persisted_plugin_;
 };
 
 inline bool IsHTMLPlugInElement(const HTMLElement& element) {
   return element.IsPluginElement();
 }
 
 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLPlugInElement);
 
 }  // namespace blink
 
 #endif  // HTMLPlugInElement_h