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

Unified Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc

Issue 23523018: Fixes use after free during drag and drop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk 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
Index: chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc
new file mode 100644
index 0000000000000000000000000000000000000000..03dfd858924d4535b8880aff73ee5dbe5f9dbe8b
--- /dev/null
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aura.cc
@@ -0,0 +1,34 @@
+// Copyright (c) 2013 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/native_browser_frame_factory.h"
+
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/views/frame/browser_frame_aura.h"
+#include "chrome/browser/ui/views/frame/browser_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
+
+NativeBrowserFrame* NativeBrowserFrameFactory::Create(
+ 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);
+}
+

Powered by Google App Engine
This is Rietveld 408576698