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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
6
7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/views/frame/browser_frame_aura.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h"
10
11 #if defined(USE_ASH)
12 #include "ash/wm/window_util.h"
13 #include "chrome/browser/ui/ash/ash_init.h"
14 #endif
15
16 #if !defined(OS_CHROMEOS)
17 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
18 #endif
19
20 NativeBrowserFrame* NativeBrowserFrameFactory::Create(
21 BrowserFrame* browser_frame,
22 BrowserView* browser_view) {
23 #if !defined(OS_CHROMEOS)
24 if (
25 #if defined(USE_ASH)
26 !chrome::ShouldOpenAshOnStartup() &&
27 #endif
28 browser_view->browser()->
29 host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
30 return new DesktopBrowserFrameAura(browser_frame, browser_view);
31 #endif
32 return new BrowserFrameAura(browser_frame, browser_view);
33 }
34
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698