summaryrefslogtreecommitdiffstats
path: root/ui/shell_dialogs/base_shell_dialog_win.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:49:20 +0000
commit4344a3c6d9e58ab7b9ee613024186ef34f619c30 (patch)
treed9c19d0f9fe541d6fff8250fe9f799ec367953e6 /ui/shell_dialogs/base_shell_dialog_win.h
parent6f90b9e6f0ad978c11510fa362791aa896fdde7d (diff)
downloadchromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.zip
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.gz
chromium_src-4344a3c6d9e58ab7b9ee613024186ef34f619c30.tar.bz2
Bring back the file dialogs for chrome AURA.
The AURA specific changes have been isolated in select_file_dialog_win.cc where we retrieve the top level window handle from the AURA root window. As per a discussion with Ben fixed the layering violation where in ui\base was depending on gfx::NativeView/NativeWindow which led to a layering violation on AURA. This was via ui\base\dialogs Moved the files out of ui\base\dialogs into a new gypi file shell_dialogs.gypi which lives in ui. It is included by ui.gyp The relevant code in chrome browser now depends on the shell_dialogs target created by shell_dialogs.gypi. The ui/base/dialogs folder will be deleted in a subsequent change. There were problems applying this patch on the try bots when I added the deletes to this change. BUG=170483 Review URL: https://codereview.chromium.org/11956031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/shell_dialogs/base_shell_dialog_win.h')
-rw-r--r--ui/shell_dialogs/base_shell_dialog_win.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/ui/shell_dialogs/base_shell_dialog_win.h b/ui/shell_dialogs/base_shell_dialog_win.h
index dcac33b..b9fa727 100644
--- a/ui/shell_dialogs/base_shell_dialog_win.h
+++ b/ui/shell_dialogs/base_shell_dialog_win.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
-#define UI_BASE_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
+#ifndef UI_SHELL_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
+#define UI_SHELL_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
#include <shlobj.h>
#include <set>
-#include "ui/base/ui_export.h"
-#include "ui/base/dialogs/base_shell_dialog.h"
+#include "ui/shell_dialogs/base_shell_dialog.h"
+#include "ui/shell_dialogs/shell_dialogs_export.h"
namespace base {
class Thread;
@@ -20,14 +20,14 @@ namespace ui {
///////////////////////////////////////////////////////////////////////////////
// A base class for all shell dialog implementations that handles showing a
// shell dialog modally on its own thread.
-class UI_EXPORT BaseShellDialogImpl {
+class SHELL_DIALOGS_EXPORT BaseShellDialogImpl {
public:
BaseShellDialogImpl();
virtual ~BaseShellDialogImpl();
protected:
// Represents a run of a dialog.
- struct UI_EXPORT RunState {
+ struct RunState {
// Owning HWND, may be null.
HWND owner;
@@ -94,4 +94,5 @@ class UI_EXPORT BaseShellDialogImpl {
} // namespace ui
-#endif // UI_BASE_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
+#endif // UI_SHELL_DIALOGS_BASE_SHELL_DIALOG_WIN_H_
+