| 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 e888efc151d2b079936041f810d5a777b4748675..6d4d816ca3bc8aee9d3c8dccbda6e93629c71f5f 100644
|
| --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| @@ -6,12 +6,14 @@
|
|
|
| #include <utility>
|
|
|
| +#include "base/command_line.h"
|
| #include "base/memory/scoped_nsobject.h"
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| +#include "content/public/common/content_switches.h"
|
|
|
| using content::WebContents;
|
|
|
| @@ -64,9 +66,13 @@ using content::WebContents;
|
| }
|
| [contentsNativeView setAutoresizingMask:NSViewWidthSizable|
|
| NSViewHeightSizable];
|
| - // The find bar will overlap the content's view when it comes out; inform
|
| - // the view.
|
| - contents_->GetView()->SetAllowOverlappingViews(true);
|
| +
|
| + if (!CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kUseCoreAnimation)) {
|
| + // The find bar will overlap the content's view when it comes out; inform
|
| + // the view.
|
| + contents_->GetView()->SetAllowOverlappingViews(true);
|
| + }
|
| }
|
|
|
| - (void)changeWebContents:(WebContents*)newContents {
|
|
|