Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2060933002: Let Flash join and be controlled by media session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pepper_to_contents
Patch Set: modified when to add/remove player to/from MediaSession Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 3682 matching lines...) Expand 10 before | Expand all | Expand 10 after
3693 // This exists for render views that don't have a WebUI, but do have WebUI 3693 // This exists for render views that don't have a WebUI, but do have WebUI
3694 // bindings enabled. 3694 // bindings enabled.
3695 void WebContentsImpl::OnWebUISend(const GURL& source_url, 3695 void WebContentsImpl::OnWebUISend(const GURL& source_url,
3696 const std::string& name, 3696 const std::string& name,
3697 const base::ListValue& args) { 3697 const base::ListValue& args) {
3698 if (delegate_) 3698 if (delegate_)
3699 delegate_->WebUISend(this, source_url, name, args); 3699 delegate_->WebUISend(this, source_url, name, args);
3700 } 3700 }
3701 3701
3702 #if defined(ENABLE_PLUGINS) 3702 #if defined(ENABLE_PLUGINS)
3703 void WebContentsImpl::OnPepperInstanceCreated() { 3703 void WebContentsImpl::OnPepperInstanceCreated(int32_t pp_instance) {
3704 FOR_EACH_OBSERVER(WebContentsObserver, observers_, PepperInstanceCreated()); 3704 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3705 PepperInstanceCreated(pp_instance));
3705 } 3706 }
3706 3707
3707 void WebContentsImpl::OnPepperInstanceDeleted() { 3708 void WebContentsImpl::OnPepperInstanceDeleted(int32_t pp_instance) {
3708 FOR_EACH_OBSERVER(WebContentsObserver, observers_, PepperInstanceDeleted()); 3709 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3710 PepperInstanceDeleted(pp_instance));
3709 } 3711 }
3710 3712
3711 void WebContentsImpl::OnPepperPluginHung(int plugin_child_id, 3713 void WebContentsImpl::OnPepperPluginHung(int plugin_child_id,
3712 const base::FilePath& path, 3714 const base::FilePath& path,
3713 bool is_hung) { 3715 bool is_hung) {
3714 UMA_HISTOGRAM_COUNTS("Pepper.PluginHung", 1); 3716 UMA_HISTOGRAM_COUNTS("Pepper.PluginHung", 1);
3715 3717
3716 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 3718 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
3717 PluginHungStatusChanged(plugin_child_id, path, is_hung)); 3719 PluginHungStatusChanged(plugin_child_id, path, is_hung));
3718 } 3720 }
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
5126 for (RenderViewHost* render_view_host : render_view_host_set) 5128 for (RenderViewHost* render_view_host : render_view_host_set)
5127 render_view_host->OnWebkitPreferencesChanged(); 5129 render_view_host->OnWebkitPreferencesChanged();
5128 } 5130 }
5129 5131
5130 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5132 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5131 JavaScriptDialogManager* dialog_manager) { 5133 JavaScriptDialogManager* dialog_manager) {
5132 dialog_manager_ = dialog_manager; 5134 dialog_manager_ = dialog_manager;
5133 } 5135 }
5134 5136
5135 } // namespace content 5137 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698