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

Unified Diff: content/common/view_messages.h

Issue 10669023: Start consolidating non-port specific code to ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clenaup Created 8 years, 6 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 | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/view_messages.h
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 8420c32ee7d0fe2232c9b05d76b7c36655e4b931..a2bafe8c240002007ef7c4197a63dd56317891bd 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -20,7 +20,6 @@
#include "content/public/common/page_zoom.h"
#include "content/public/common/referrer.h"
#include "content/public/common/renderer_preferences.h"
-#include "content/public/common/selected_file_info.h"
#include "content/public/common/stop_find_action.h"
#include "content/public/common/webkit_param_traits.h"
#include "content/public/common/window_container_type.h"
@@ -38,6 +37,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginAction.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+#include "ui/base/dialogs/selected_file_info.h"
#include "ui/base/ime/text_input_type.h"
#include "ui/base/range/range.h"
#include "ui/gfx/point.h"
@@ -353,7 +353,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::MediaLogEvent)
IPC_STRUCT_TRAITS_MEMBER(time)
IPC_STRUCT_TRAITS_END()
-IPC_STRUCT_TRAITS_BEGIN(content::SelectedFileInfo)
+IPC_STRUCT_TRAITS_BEGIN(ui::SelectedFileInfo)
IPC_STRUCT_TRAITS_MEMBER(path)
IPC_STRUCT_TRAITS_MEMBER(display_name)
IPC_STRUCT_TRAITS_END()
@@ -1099,7 +1099,7 @@ IPC_MESSAGE_ROUTED2(ViewMsg_DidChooseColorResponse, unsigned, SkColor)
IPC_MESSAGE_ROUTED1(ViewMsg_DidEndColorChooser, unsigned)
IPC_MESSAGE_ROUTED1(ViewMsg_RunFileChooserResponse,
- std::vector<content::SelectedFileInfo>)
+ std::vector<ui::SelectedFileInfo>)
// Provides the results of directory enumeration.
IPC_MESSAGE_ROUTED2(ViewMsg_EnumerateDirectoryResponse,
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698