Fixing RenderViewImpl constructor initializers ordering.

The problem is that one of the variables was incorrectly placed in the android ifdef. Also, moving the plugins specific section before Misc.

BUG=

Review URL: https://chromiumcodereview.appspot.com/13831008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195177 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_view_impl.cc

@@ -665,7 +665,12 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       body_background_color_(SK_ColorWHITE),
       expected_content_intent_id_(0),
       media_player_proxy_(NULL),
+#endif
+#if defined(OS_WIN)
+      focused_plugin_id_(-1),
+#endif
       enumeration_completion_id_(0),
+#if defined(OS_ANDROID)
       ALLOW_THIS_IN_INITIALIZER_LIST(
           load_progress_tracker_(new LoadProgressTracker(this))),
 #endif
@@ -674,9 +679,6 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params)
       handling_select_range_(false),
       next_snapshot_id_(0),
       allow_partial_swap_(params->allow_partial_swap),
-#if defined(OS_WIN)
-      focused_plugin_id_(-1),
-#endif
       updating_frame_tree_(false),
       pending_frame_tree_update_(false),
       target_process_id_(0),

content/renderer/render_view_impl.h

@@ -1449,6 +1449,18 @@ class CONTENT_EXPORT RenderViewImpl
   scoped_ptr<RendererDateTimePicker> date_time_picker_client_;
 #endif
 
+  // Plugins -------------------------------------------------------------------
+
+  // All the currently active plugin delegates for this RenderView; kept so
+  // that we can enumerate them to send updates about things like window
+  // location or tab focus and visibily. These are non-owning references.
+  std::set<WebPluginDelegateProxy*> plugin_delegates_;
+
+#if defined(OS_WIN)
+  // The ID of the focused NPAPI plug-in.
+  int focused_plugin_id_;
+#endif
+
   // Misc ----------------------------------------------------------------------
 
   // The current and pending file chooser completion objects. If the queue is
@@ -1507,20 +1519,10 @@ class CONTENT_EXPORT RenderViewImpl
       PendingSnapshotMap;
   PendingSnapshotMap pending_snapshots_;
 
+  // Allows to selectively disable partial buffer swap for this renderer's
+  // compositor.
   bool allow_partial_swap_;
 
-  // Plugins -------------------------------------------------------------------
-
-  // All the currently active plugin delegates for this RenderView; kept so
-  // that we can enumerate them to send updates about things like window
-  // location or tab focus and visibily. These are non-owning references.
-  std::set<WebPluginDelegateProxy*> plugin_delegates_;
-
-#if defined(OS_WIN)
-  // The ID of the focused NPAPI plug-in.
-  int focused_plugin_id_;
-#endif
-
   // Allows JS to access DOM automation. The JS object is only exposed when the
   // DOM automation bindings are enabled.
   scoped_ptr<DomAutomationController> dom_automation_controller_;