From ddb034b332eb6674d5e06e1d67cb5cf3d9e473a7 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Tue, 26 Jun 2012 20:31:39 +0000 Subject: Reland: Start consolidating non-port specific code to ui/base/dialogs. (All that's changed is moving the implementations out of headers and into dedicated source files. The win_aura trybots now pass.) This moves content::SelectedFileInfo (what the select dialog outputs) and BaseShellDialog to ui/base/dialogs/. (This was split off from https://chromiumcodereview.appspot.com/10667026/ because that patch is getting huge.) BUG=134529 TEST=none TBR=sky,jam First Review URL: https://chromiumcodereview.appspot.com/10669023 Review URL: https://chromiumcodereview.appspot.com/10665050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144261 0039d316-1c4b-4281-b951-d872f2087c98 --- content/public/browser/render_view_host.h | 7 ++++-- content/public/common/selected_file_info.h | 39 ------------------------------ 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 content/public/common/selected_file_info.h (limited to 'content/public') diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 401fe0e..14226ea 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -25,6 +25,10 @@ namespace gfx { class Point; } +namespace ui { +struct SelectedFileInfo; +} + namespace WebKit { struct WebFindOptions; struct WebMediaPlayerAction; @@ -38,7 +42,6 @@ class RenderViewHostDelegate; class SessionStorageNamespace; class SiteInstance; struct CustomContextMenuContext; -struct SelectedFileInfo; // A RenderViewHost is responsible for creating and talking to a RenderView // object in a child process. It exposes a high level API to users, for things @@ -206,7 +209,7 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { // base::PlatformFileFlags enum which specify which file permissions should // be granted to the renderer. virtual void FilesSelectedInChooser( - const std::vector& files, + const std::vector& files, int permissions) = 0; virtual RenderViewHostDelegate* GetDelegate() const = 0; diff --git a/content/public/common/selected_file_info.h b/content/public/common/selected_file_info.h deleted file mode 100644 index 124a22b..0000000 --- a/content/public/common/selected_file_info.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2012 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 CONTENT_PUBLIC_COMMON_SELECTED_FILE_INFO_H_ -#define CONTENT_PUBLIC_COMMON_SELECTED_FILE_INFO_H_ -#pragma once - -#include - -#include "base/file_path.h" -#include "base/string16.h" -#include "content/common/content_export.h" - -namespace content { - -// Struct used for passing selected file info to WebKit. -struct CONTENT_EXPORT SelectedFileInfo { - // The real path to the selected file. This can be a snapshot file with a - // human unreadable name like /blah/.d41d8cd98f00b204e9800998ecf8427e. - FilePath path; - - // This field is optional. The display name contains only the base name - // portion of a file name (ex. no path separators), and used for displaying - // selected file names. If this field is empty, the base name portion of - // |path| is used for displaying. - FilePath::StringType display_name; - - SelectedFileInfo() {} - SelectedFileInfo(const FilePath& in_path, - const FilePath::StringType& in_display_name) - : path(in_path), - display_name(in_display_name) { - } -}; - -} // namespace content - -#endif // CONTENT_PUBLIC_COMMON_SELECTED_FILE_INFO_H_ -- cgit v1.1