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

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

Issue 386463002: Remove --disable-fullscreen-within-tab command-line flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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
Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
index 3a44e79fac722904498a87ff70e2ff317595d07d..2e54b499dbe186ff5b4157dcf64eab44199aa987 100644
--- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
@@ -177,11 +177,9 @@ class FullscreenObserver : public WebContentsObserver {
@implementation TabContentsController
@synthesize webContents = contents_;
-- (id)initWithContents:(WebContents*)contents
- andAutoEmbedFullscreen:(BOOL)enableEmbeddedFullscreen {
+- (id)initWithContents:(WebContents*)contents {
if ((self = [super initWithNibName:nil bundle:nil])) {
- if (enableEmbeddedFullscreen)
- fullscreenObserver_.reset(new FullscreenObserver(self));
+ fullscreenObserver_.reset(new FullscreenObserver(self));
[self changeWebContents:contents];
}
return self;
@@ -248,13 +246,9 @@ class FullscreenObserver : public WebContentsObserver {
- (void)changeWebContents:(WebContents*)newContents {
contents_ = newContents;
- if (fullscreenObserver_) {
- fullscreenObserver_->Observe(contents_);
- isEmbeddingFullscreenWidget_ =
- contents_ && contents_->GetFullscreenRenderWidgetHostView();
- } else {
- isEmbeddingFullscreenWidget_ = NO;
- }
+ fullscreenObserver_->Observe(contents_);
+ isEmbeddingFullscreenWidget_ =
+ contents_ && contents_->GetFullscreenRenderWidgetHostView();
}
// Returns YES if the tab represented by this controller is the front-most.
@@ -309,8 +303,6 @@ class FullscreenObserver : public WebContentsObserver {
}
- (BOOL)contentsInFullscreenCaptureMode {
- if (!fullscreenObserver_)
- return NO;
// Note: Grab a known-valid WebContents pointer from |fullscreenObserver_|.
content::WebContents* const wc = fullscreenObserver_->web_contents();
if (!wc ||
« no previous file with comments | « chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698