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

Unified Diff: ui/shell_dialogs/select_file_dialog_win.cc

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just revert changes to ui/app_list/. Created 6 years, 8 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
« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/select_file_dialog_win.cc
diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
index 7a8e2e6c9d483fc0d60f7339c034f9df90b6fe4e..381e44047ae5701c4e2b9303c7af7d64f847e5b1 100644
--- a/ui/shell_dialogs/select_file_dialog_win.cc
+++ b/ui/shell_dialogs/select_file_dialog_win.cc
@@ -26,17 +26,14 @@
#include "base/win/shortcut.h"
#include "base/win/windows_version.h"
#include "grit/ui_strings.h"
+#include "ui/aura/remote_window_tree_host_win.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/shell_dialogs/base_shell_dialog_win.h"
#include "ui/shell_dialogs/shell_dialogs_delegate.h"
-#if defined(USE_AURA)
-#include "ui/aura/remote_window_tree_host_win.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#endif
-
namespace {
// Given |extension|, if it's not empty, then remove the leading dot.
@@ -546,7 +543,6 @@ void SelectFileDialogImpl::SelectFileImpl(
void* params) {
has_multiple_file_type_choices_ =
file_types ? file_types->extensions.size() > 1 : true;
-#if defined(USE_AURA)
// If the owning_window passed in is in metro then we need to forward the
// file open/save operations to metro.
if (GetShellDialogsDelegate() &&
@@ -602,9 +598,7 @@ void SelectFileDialogImpl::SelectFileImpl(
}
HWND owner = owning_window && owning_window->GetRootWindow()
? owning_window->GetHost()->GetAcceleratedWidget() : NULL;
-#else
- HWND owner = owning_window;
-#endif
+
ExecuteSelectParams execute_params(type, base::UTF16ToWide(title),
default_path, file_types, file_type_index,
default_extension, BeginRun(owner),
@@ -620,13 +614,9 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
}
bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow owning_window) const {
-#if defined(USE_AURA)
if (!owning_window->GetRootWindow())
return false;
HWND owner = owning_window->GetHost()->GetAcceleratedWidget();
-#else
- HWND owner = owning_window;
-#endif
return listener_ && IsRunningDialogForOwner(owner);
}
« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698