Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / tab_contents / tab_contents_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/src/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
index 3a44e79..44f53c4 100644 (file)
--- a/src/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
+++ b/src/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/command_line.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/devtools/devtools_window.h"
@@ -18,7 +17,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/base/cocoa/animation_utils.h"
-#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/geometry/rect.h"
 
 using content::WebContents;
@@ -86,16 +84,11 @@ class FullscreenObserver : public WebContentsObserver {
 - (id)initWithDelegate:(TabContentsController*)delegate {
   if ((self = [super initWithFrame:NSZeroRect])) {
     delegate_ = delegate;
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kDisableCoreAnimation)) {
-      // TODO(ccameron): Remove the -drawRect: method once the
-      // kDisableCoreAnimation switch is removed.
-      ScopedCAActionDisabler disabler;
-      base::scoped_nsobject<CALayer> layer([[CALayer alloc] init]);
-      [layer setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
-      [self setLayer:layer];
-      [self setWantsLayer:YES];
-    }
+    ScopedCAActionDisabler disabler;
+    base::scoped_nsobject<CALayer> layer([[CALayer alloc] init]);
+    [layer setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
+    [self setLayer:layer];
+    [self setWantsLayer:YES];
   }
   return self;
 }
@@ -177,11 +170,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 +239,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 +296,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 ||