Let Flash join and be controlled by media session

content/browser/web_contents/web_contents_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <stdint.h>
 
 #include <functional>
@@ skipping 45 matching lines @@
 class BrowserPluginGuest;
 class DateTimeChooserAndroid;
 class DownloadItem;
 class FindRequestManager;
 class GeolocationServiceContext;
 class InterstitialPageImpl;
 class JavaScriptDialogManager;
 class LoaderIOThreadNotifier;
 class ManifestManagerHost;
 class MediaWebContentsObserver;
+class PepperWebContentsObserver;
 class PluginContentOriginWhitelist;
 class PowerSaveBlocker;
 class RenderViewHost;
 class RenderViewHostDelegateView;
 class RenderWidgetHostImpl;
 class RenderWidgetHostInputEventRouter;
 class SavePackage;
 class ScreenOrientationDispatcherHost;
 class SiteInstance;
 class TestWebContents;
@@ skipping 659 matching lines @@
 
   // Called by MediaWebContentsObserver when playback starts or stops.  See the
   // WebContentsObserver function stubs for more details.
   void MediaStartedPlaying(const WebContentsObserver::MediaPlayerId& id);
   void MediaStoppedPlaying(const WebContentsObserver::MediaPlayerId& id);
 
   MediaWebContentsObserver* media_web_contents_observer() {
     return media_web_contents_observer_.get();
   }
 
+#if defined(ENABLE_PLUGINS)
+  PepperWebContentsObserver* pepper_web_contents_observer() {
+    return pepper_web_contents_observer_.get();
+  }
+#endif  // defined(ENABLE_PLUGINS)
+
   // Update the web contents visibility.
   void UpdateWebContentsVisibility(bool visible);
 
   // Called by FindRequestManager when find replies come in from a renderer
   // process.
   void NotifyFindReply(int request_id,
                        int number_of_matches,
                        const gfx::Rect& selection_rect,
                        int active_match_ordinal,
                        bool final_update);
@@ skipping 182 matching lines @@
   void OnOpenColorChooser(int color_chooser_id,
                           SkColor color,
                           const std::vector<ColorSuggestion>& suggestions);
   void OnEndColorChooser(int color_chooser_id);
   void OnSetSelectedColorInColorChooser(int color_chooser_id, SkColor color);
   void OnWebUISend(const GURL& source_url,
                    const std::string& name,
                    const base::ListValue& args);
   void OnUpdatePageImportanceSignals(const PageImportanceSignals& signals);
 #if defined(ENABLE_PLUGINS)
-  void OnPepperInstanceCreated();
-  void OnPepperInstanceDeleted();
+  void OnPepperInstanceCreated(int32_t pp_instance);
+  void OnPepperInstanceDeleted(int32_t pp_instance);
   void OnPepperPluginHung(int plugin_child_id,
                           const base::FilePath& path,
                           bool is_hung);
   void OnPluginCrashed(const base::FilePath& plugin_path,
                        base::ProcessId plugin_pid);
   void OnRequestPpapiBrokerPermission(int routing_id,
                                       const GURL& url,
                                       const base::FilePath& plugin_path);
 
   // Callback function when requesting permission to access the PPAPI broker.
@@ skipping 417 matching lines @@
   size_t bluetooth_connected_device_count_;
 
   bool virtual_keyboard_requested_;
 
   // Notifies ResourceDispatcherHostImpl of various events related to loading.
   std::unique_ptr<LoaderIOThreadNotifier> loader_io_thread_notifier_;
 
   // Manages media players, CDMs, and power save blockers for media.
   std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_;
 
+#if defined(ENABLE_PLUGINS)
+  // Observer for pepper creation, deletion and playback.
+  std::unique_ptr<PepperWebContentsObserver> pepper_web_contents_observer_;

[jochen (gone - plz use gerrit), 2016/06/27 11:47:11]

have you considered inlining this class in web contents? every observer adds
some overhead to each callback, whether it's implemented or not

[Zhiqiang Zhang (Slow), 2016/06/28 18:53:24]

I made PepperWebContentsObserver not inheriting from WebContentsObserver (also
renamed as PepperPlaybackObserver). Then I delegate the call from
WebContentsImpl to PepperPlaybackObserver. Please see the diff.

Hope this is what you expected. Tell me if I'm wrong.

+#endif  // defined(ENABLE_PLUGINS)
+
   std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
 
   PageImportanceSignals page_importance_signals_;
 
   bool page_scale_factor_is_one_;
 
   // TextInputManager tracks the IME-related state for all the
   // RenderWidgetHostViews on this WebContents. Only exists on the outermost
   // WebContents and is automatically destroyed when a WebContents becomes an
   // inner WebContents by attaching to an outer WebContents. Then the
@@ skipping 24 matching lines @@
   // Adds/removes a callback called on creation of each new WebContents.
   static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
   static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(FriendZone);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_