Fixes use after free during drag and drop.

chrome/browser/ui/views/frame/browser_frame_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_frame_aura.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
 #include "ui/views/view.h"
 
 #if defined(USE_ASH)
 #include "ash/wm/window_util.h"
-#include "chrome/browser/ui/ash/ash_init.h"
-#endif
-
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
 #endif
 
 using aura::Window;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura::WindowPropertyWatcher
 
 class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver {
  public:
   explicit WindowPropertyWatcher(BrowserFrameAura* browser_frame_aura,
@@ skipping 118 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 // static
 const gfx::Font& BrowserFrame::GetTitleFont() {
   static gfx::Font* title_font = new gfx::Font;
   return *title_font;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NativeBrowserFrame, public:
-
-// static
-NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
-    BrowserFrame* browser_frame,
-    BrowserView* browser_view) {
-#if !defined(OS_CHROMEOS)
-  if (
-#if defined(USE_ASH)
-      !chrome::ShouldOpenAshOnStartup() &&
-#endif
-      browser_view->browser()->
-          host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
-    return new DesktopBrowserFrameAura(browser_frame, browser_view);
-#endif
-  return new BrowserFrameAura(browser_frame, browser_view);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, private:
 
 BrowserFrameAura::~BrowserFrameAura() {
 }
 
 void BrowserFrameAura::SetWindowAutoManaged() {
 #if defined(USE_ASH)
   if (browser_view_->browser()->type() != Browser::TYPE_POPUP ||
       browser_view_->browser()->is_app())
     ash::wm::SetWindowPositionManaged(GetNativeWindow(), true);
 #endif
 }