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

Side by Side Diff: chrome/browser/ui/libgtk2ui/select_file_dialog_impl.cc

Issue 10829021: Use current gtk dialogs in linux_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make gtk window transient to aura window Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // This file implements common select dialog functionality between GTK and KDE. 5 // This file implements common select dialog functionality between GTK and KDE.
6 6
7 //#include "chrome/browser/ui/gtk/select_file_dialog_impl.h" 7 #include "chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h"
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/nix/xdg_util.h" 11 #include "base/nix/xdg_util.h"
12 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 14
15 using content::BrowserThread; 15 using content::BrowserThread;
16 16
17 namespace { 17 namespace {
18 18
19 enum UseKdeFileDialogStatus { 19 enum UseKdeFileDialogStatus {
20 UNKNOWN, 20 UNKNOWN,
21 NO_KDE, 21 NO_KDE,
22 YES_KDE 22 YES_KDE
23 }; 23 };
24 24
25 UseKdeFileDialogStatus use_kde_ = UNKNOWN; 25 UseKdeFileDialogStatus use_kde_ = UNKNOWN;
26 26
27 } // namespace 27 } // namespace
28 28
29 namespace libgtk2ui {
30
29 FilePath* SelectFileDialogImpl::last_saved_path_ = NULL; 31 FilePath* SelectFileDialogImpl::last_saved_path_ = NULL;
30 FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; 32 FilePath* SelectFileDialogImpl::last_opened_path_ = NULL;
31 33
32 // static 34 // static
33 SelectFileDialog* SelectFileDialog::Create(Listener* listener, 35 ui::SelectFileDialog* SelectFileDialogImpl::Create(
34 ui::SelectFilePolicy* policy) { 36 ui::SelectFileDialog::Listener* listener,
37 ui::SelectFilePolicy* policy) {
35 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 38 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
36 if (use_kde_ == UNKNOWN) { 39 if (use_kde_ == UNKNOWN) {
37 // Start out assumimg we are not going to use KDE. 40 // Start out assumimg we are not going to use KDE.
38 use_kde_ = NO_KDE; 41 use_kde_ = NO_KDE;
39 42
40 // Check to see if KDE is the desktop environment. 43 // Check to see if KDE is the desktop environment.
41 scoped_ptr<base::Environment> env(base::Environment::Create()); 44 scoped_ptr<base::Environment> env(base::Environment::Create());
42 base::nix::DesktopEnvironment desktop = 45 base::nix::DesktopEnvironment desktop =
43 base::nix::GetDesktopEnvironment(env.get()); 46 base::nix::GetDesktopEnvironment(env.get());
44 if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3 || 47 if (desktop == base::nix::DESKTOP_ENVIRONMENT_KDE3 ||
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 84 }
82 85
83 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const { 86 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
84 return parents_.find(parent_window) != parents_.end(); 87 return parents_.find(parent_window) != parents_.end();
85 } 88 }
86 89
87 bool SelectFileDialogImpl::CallDirectoryExistsOnUIThread(const FilePath& path) { 90 bool SelectFileDialogImpl::CallDirectoryExistsOnUIThread(const FilePath& path) {
88 base::ThreadRestrictions::ScopedAllowIO allow_io; 91 base::ThreadRestrictions::ScopedAllowIO allow_io;
89 return file_util::DirectoryExists(path); 92 return file_util::DirectoryExists(path);
90 } 93 }
94
95 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698