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

Unified Diff: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

Issue 23477051: Embed Flash Fullscreen widget within browser window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add caution comment to chrome_switches.cc. Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h
index c9cab99b4b4cf5b320ee660afb460cff29454fc9..6f1ca5bfbcee14c3bcbfc7afa8615398d319d4e7 100644
--- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h
@@ -7,6 +7,10 @@
#include <Cocoa/Cocoa.h>
+#include "base/memory/scoped_ptr.h"
+
+class FullscreenObserver;
+
namespace content {
class WebContents;
}
@@ -21,11 +25,20 @@ class WebContents;
@interface TabContentsController : NSViewController {
@private
content::WebContents* contents_; // weak
+ // When |fullscreenObserver_| not-NULL, TabContentsController monitors for
+ // and auto-embeds fullscreen widgets as a subview.
+ scoped_ptr<FullscreenObserver> fullscreenObserver_;
+ // Set to true while TabContentsController is embedding a fullscreen widget
+ // view as a subview instead of the normal WebContentsView render view.
+ BOOL isEmbeddingFullscreenWidget_;
}
@property(readonly, nonatomic) content::WebContents* webContents;
-// Create the contents of a tab represented by |contents|.
-- (id)initWithContents:(content::WebContents*)contents;
+// Create the contents of a tab represented by |contents|. When
+// |enableEmbeddedFullscreen| is true, the WebContents view will automatically
+// be swapped with a fullscreen render widget owned by the current WebContents.
+- (id)initWithContents:(content::WebContents*)contents
+ andAutoEmbedFullscreen:(BOOL)enableEmbeddedFullscreen;
// Call when the tab contents is about to be replaced with the currently
// selected tab contents to do not trigger unnecessary content relayout.
@@ -54,6 +67,10 @@ class WebContents;
// an entirely new tab contents object.
- (void)tabDidChange:(content::WebContents*)updatedContents;
+// Called to switch the container's subview to the WebContents-owned fullscreen
+// widget or back to WebContentsView's widget.
+- (void)toggleFullscreenWidget:(BOOL)enterFullscreen;
+
@end
#endif // CHROME_BROWSER_UI_COCOA_TAB_CONTENTS_TAB_CONTENTS_CONTROLLER_H_
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698