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

Side by Side Diff: chrome/browser/ui/views/select_file_dialog_aura.cc

Issue 9478015: Aura: Build on the linux desktop, plus add USE_ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try to minimize shell.h change Created 8 years, 9 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
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/select_file_dialog.h" 5 #include "chrome/browser/ui/select_file_dialog.h"
6 6
7 #include "chrome/browser/ui/views/select_file_dialog_extension.h" 7 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 9
10 using content::BrowserThread; 10 using content::BrowserThread;
11 11
12 // static 12 // static
13 SelectFileDialog* SelectFileDialog::Create(Listener* listener) { 13 SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
14 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 14 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
15 #if defined(OS_WIN) 15 #if defined(USE_ASH) && defined(FILE_MANAGER_EXTENSION)
16 return SelectFileDialogExtension::Create(listener);
17 #else
16 return NULL; 18 return NULL;
17 #else
18 return new SelectFileDialogExtension(listener);
19 #endif 19 #endif
20 } 20 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698