From 4344a3c6d9e58ab7b9ee613024186ef34f619c30 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Thu, 17 Jan 2013 23:49:20 +0000 Subject: 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 --- ui/shell_dialogs/select_file_dialog.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'ui/shell_dialogs/select_file_dialog.h') diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h index b5922d9..6478b6b 100644 --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h @@ -1,9 +1,9 @@ -// 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_SELECT_FILE_DIALOG_H_ -#define UI_BASE_DIALOGS_SELECT_FILE_DIALOG_H_ +#ifndef UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_ +#define UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_ #include #include @@ -14,9 +14,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "ui/base/dialogs/base_shell_dialog.h" -#include "ui/base/ui_export.h" +#include "ui/base/linux_ui.h" #include "ui/gfx/native_widget_types.h" +#include "ui/shell_dialogs/base_shell_dialog.h" +#include "ui/shell_dialogs/shell_dialogs_export.h" namespace ui { class SelectFileDialogFactory; @@ -24,7 +25,7 @@ class SelectFilePolicy; struct SelectedFileInfo; // Shows a dialog box for selecting a file or a folder. -class UI_EXPORT SelectFileDialog +class SHELL_DIALOGS_EXPORT SelectFileDialog : public base::RefCountedThreadSafe, public ui::BaseShellDialog { public: @@ -39,7 +40,7 @@ class UI_EXPORT SelectFileDialog // An interface implemented by a Listener object wishing to know about the // the result of the Select File/Folder action. These callbacks must be // re-entrant. - class UI_EXPORT Listener { + class SHELL_DIALOGS_EXPORT Listener { public: // Notifies the Listener that a file/folder selection has been made. The // file/folder path is in |path|. |params| is contextual passed to @@ -94,7 +95,7 @@ class UI_EXPORT SelectFileDialog ui::SelectFilePolicy* policy); // Holds information about allowed extensions on a file save dialog. - struct UI_EXPORT FileTypeInfo { + struct SHELL_DIALOGS_EXPORT FileTypeInfo { FileTypeInfo(); ~FileTypeInfo(); @@ -198,4 +199,5 @@ class UI_EXPORT SelectFileDialog } // namespace ui -#endif // UI_BASE_DIALOGS_SELECT_FILE_DIALOG_H_ +#endif // UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_ + -- cgit v1.1