Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <gdk/gdkx.h> | 5 #include "content/public/browser/browser_thread.h" |
|
jam
2011/11/07 21:43:24
can we sort this now that you added the gtk header
Jói
2011/11/18 23:21:44
This is no longer part of the change.
| |
| 6 #include <gtk/gtk.h> | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/file_util.h" | 13 #include "base/file_util.h" |
| 14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
| 16 #include "base/mime_util.h" | 16 #include "base/mime_util.h" |
| 17 #include "base/process_util.h" | 17 #include "base/process_util.h" |
| 18 #include "base/string_number_conversions.h" | 18 #include "base/string_number_conversions.h" |
| 19 #include "base/string_util.h" | 19 #include "base/string_util.h" |
| 20 #include "base/sys_string_conversions.h" | 20 #include "base/sys_string_conversions.h" |
| 21 #include "base/threading/thread.h" | 21 #include "base/threading/thread.h" |
| 22 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
| 23 #include "base/utf_string_conversions.h" | 23 #include "base/utf_string_conversions.h" |
| 24 #include "chrome/browser/ui/gtk/dialogs_common.h" | 24 #include "chrome/browser/ui/gtk/dialogs_common.h" |
| 25 #include "chrome/browser/ui/shell_dialogs.h" | 25 #include "chrome/browser/ui/shell_dialogs.h" |
| 26 #include "content/public/browser/browser_thread.h" | |
| 27 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 28 #include "ui/base/l10n/l10n_util.h" | 27 #include "ui/base/l10n/l10n_util.h" |
| 29 | 28 |
| 29 // These conflict with base/tracked_objects.h, so need to come last. | |
| 30 #include <gdk/gdkx.h> | |
| 31 #include <gtk/gtk.h> | |
| 32 | |
| 30 using content::BrowserThread; | 33 using content::BrowserThread; |
| 31 | 34 |
| 32 // Implementation of SelectFileDialog that shows a KDE common dialog for | 35 // Implementation of SelectFileDialog that shows a KDE common dialog for |
| 33 // choosing a file or folder. This acts as a modal dialog. | 36 // choosing a file or folder. This acts as a modal dialog. |
| 34 class SelectFileDialogImplKDE : public SelectFileDialogImpl { | 37 class SelectFileDialogImplKDE : public SelectFileDialogImpl { |
| 35 public: | 38 public: |
| 36 explicit SelectFileDialogImplKDE(Listener* listener); | 39 explicit SelectFileDialogImplKDE(Listener* listener); |
| 37 ~SelectFileDialogImplKDE(); | 40 ~SelectFileDialogImplKDE(); |
| 38 | 41 |
| 39 protected: | 42 protected: |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 407 filenames_fp.push_back(path); | 410 filenames_fp.push_back(path); |
| 408 } | 411 } |
| 409 | 412 |
| 410 if (filenames_fp.empty()) { | 413 if (filenames_fp.empty()) { |
| 411 FileNotSelected(params); | 414 FileNotSelected(params); |
| 412 return; | 415 return; |
| 413 } | 416 } |
| 414 MultiFilesSelected(filenames_fp, params); | 417 MultiFilesSelected(filenames_fp, params); |
| 415 } | 418 } |
| 416 | 419 |
| OLD | NEW |