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

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

Issue 110683002: Split the hole punching logic from GOOGLE_TV ifdef to VIDEO_HOLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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
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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/port/browser/render_view_host_delegate_view.h" 10 #include "content/port/browser/render_view_host_delegate_view.h"
(...skipping 11 matching lines...) Expand all
22 public: 22 public:
23 WebContentsViewAndroid(WebContentsImpl* web_contents, 23 WebContentsViewAndroid(WebContentsImpl* web_contents,
24 WebContentsViewDelegate* delegate); 24 WebContentsViewDelegate* delegate);
25 virtual ~WebContentsViewAndroid(); 25 virtual ~WebContentsViewAndroid();
26 26
27 // Sets the interface to the view system. ContentViewCoreImpl is owned 27 // Sets the interface to the view system. ContentViewCoreImpl is owned
28 // by its Java ContentViewCore counterpart, whose lifetime is managed 28 // by its Java ContentViewCore counterpart, whose lifetime is managed
29 // by the UI frontend. 29 // by the UI frontend.
30 void SetContentViewCore(ContentViewCoreImpl* content_view_core); 30 void SetContentViewCore(ContentViewCoreImpl* content_view_core);
31 31
32 #if defined(GOOGLE_TV) 32 #if defined(VIDEO_HOLE)
33 void NotifyExternalSurface(int player_id, 33 void NotifyExternalSurface(int player_id,
34 bool is_request, 34 bool is_request,
35 const gfx::RectF& rect); 35 const gfx::RectF& rect);
36 #endif 36 #endif // defined(VIDEO_HOLE)
37 37
38 // WebContentsView implementation -------------------------------------------- 38 // WebContentsView implementation --------------------------------------------
39 virtual gfx::NativeView GetNativeView() const OVERRIDE; 39 virtual gfx::NativeView GetNativeView() const OVERRIDE;
40 virtual gfx::NativeView GetContentNativeView() const OVERRIDE; 40 virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
41 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE; 41 virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
42 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE; 42 virtual void GetContainerBounds(gfx::Rect* out) const OVERRIDE;
43 virtual void OnTabCrashed(base::TerminationStatus status, 43 virtual void OnTabCrashed(base::TerminationStatus status,
44 int error_code) OVERRIDE; 44 int error_code) OVERRIDE;
45 virtual void SizeContents(const gfx::Size& size) OVERRIDE; 45 virtual void SizeContents(const gfx::Size& size) OVERRIDE;
46 virtual void Focus() OVERRIDE; 46 virtual void Focus() OVERRIDE;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 // Interface for extensions to WebContentsView. Used to show the context menu. 90 // Interface for extensions to WebContentsView. Used to show the context menu.
91 scoped_ptr<WebContentsViewDelegate> delegate_; 91 scoped_ptr<WebContentsViewDelegate> delegate_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); 93 DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
94 }; 94 };
95 95
96 } // namespace content 96 } // namespace content
97 97
98 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ 98 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698