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

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

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_view_android.h" 5 #include "content/browser/web_contents/web_contents_view_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/android/content_view_core_impl.h" 8 #include "content/browser/android/content_view_core_impl.h"
9 #include "content/browser/android/media_player_manager_android.h" 9 #include "content/browser/android/media_player_manager_impl.h"
10 #include "content/browser/renderer_host/render_widget_host_view_android.h" 10 #include "content/browser/renderer_host/render_widget_host_view_android.h"
11 #include "content/browser/renderer_host/render_view_host_factory.h" 11 #include "content/browser/renderer_host/render_view_host_factory.h"
12 #include "content/browser/renderer_host/render_view_host_impl.h" 12 #include "content/browser/renderer_host/render_view_host_impl.h"
13 #include "content/browser/web_contents/interstitial_page_impl.h" 13 #include "content/browser/web_contents/interstitial_page_impl.h"
14 #include "content/browser/web_contents/web_contents_impl.h" 14 #include "content/browser/web_contents/web_contents_impl.h"
15 #include "content/public/browser/web_contents_delegate.h" 15 #include "content/public/browser/web_contents_delegate.h"
16 16
17 namespace content { 17 namespace content {
18 WebContentsViewPort* CreateWebContentsView( 18 WebContentsViewPort* CreateWebContentsView(
19 WebContentsImpl* web_contents, 19 WebContentsImpl* web_contents,
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 // This is called when we the renderer asks us to take focus back (i.e., it has 224 // This is called when we the renderer asks us to take focus back (i.e., it has
225 // iterated past the last focusable element on the page). 225 // iterated past the last focusable element on the page).
226 void WebContentsViewAndroid::TakeFocus(bool reverse) { 226 void WebContentsViewAndroid::TakeFocus(bool reverse) {
227 if (web_contents_->GetDelegate() && 227 if (web_contents_->GetDelegate() &&
228 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse)) 228 web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
229 return; 229 return;
230 web_contents_->GetRenderWidgetHostView()->Focus(); 230 web_contents_->GetRenderWidgetHostView()->Focus();
231 } 231 }
232 232
233 } // namespace content 233 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698