diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-22 01:11:57 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-22 01:11:57 +0000 |
| commit | 73cb2514f1df0e3cf59464b82e9dd0947b44bab8 (patch) | |
| tree | c132dacc6b9aab1197d0901c510c52605a9102ea | |
| parent | be7966298cda8f1e67d5790322d744eab906b85e (diff) | |
| download | chromium_src-73cb2514f1df0e3cf59464b82e9dd0947b44bab8.zip chromium_src-73cb2514f1df0e3cf59464b82e9dd0947b44bab8.tar.gz chromium_src-73cb2514f1df0e3cf59464b82e9dd0947b44bab8.tar.bz2 | |
Cleanup: Make RendererDateTimePicker Android-only.
Review URL: https://codereview.chromium.org/341623004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278992 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/common/view_messages.h | 11 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 4 | ||||
| -rw-r--r-- | content/renderer/android/renderer_date_time_picker.cc (renamed from content/renderer/renderer_date_time_picker.cc) | 8 | ||||
| -rw-r--r-- | content/renderer/android/renderer_date_time_picker.h (renamed from content/renderer/renderer_date_time_picker.h) | 8 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.h | 10 |
5 files changed, 20 insertions, 21 deletions
diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 3815910..b3f755f 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -505,9 +505,16 @@ IPC_STRUCT_END() // Messages sent from the browser to the renderer. +#if defined(OS_ANDROID) // Tells the renderer to cancel an opened date/time dialog. IPC_MESSAGE_ROUTED0(ViewMsg_CancelDateTimeDialog) +// Replaces a date time input field. +IPC_MESSAGE_ROUTED1(ViewMsg_ReplaceDateTime, + double /* dialog_value */) + +#endif + // Get all savable resource links from current webpage, include main // frame and sub-frame. IPC_MESSAGE_ROUTED1(ViewMsg_GetAllSavableResourceLinksForCurrentPage, @@ -633,10 +640,6 @@ IPC_MESSAGE_ROUTED3(ViewMsg_Find, IPC_MESSAGE_ROUTED1(ViewMsg_StopFinding, content::StopFindAction /* action */) -// Replaces a date time input field. -IPC_MESSAGE_ROUTED1(ViewMsg_ReplaceDateTime, - double /* dialog_value */) - // Copies the image at location x, y to the clipboard (if there indeed is an // image at that location). IPC_MESSAGE_ROUTED2(ViewMsg_CopyImageAt, diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 444a665..67aa431 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -96,6 +96,8 @@ 'renderer/android/email_detector.h', 'renderer/android/phone_number_detector.cc', 'renderer/android/phone_number_detector.h', + 'renderer/android/renderer_date_time_picker.cc', + 'renderer/android/renderer_date_time_picker.h', 'renderer/android/synchronous_compositor_factory.cc', 'renderer/android/synchronous_compositor_factory.h', 'renderer/battery_status/battery_status_dispatcher.cc', @@ -396,8 +398,6 @@ 'renderer/render_widget_fullscreen.h', 'renderer/renderer_clipboard_client.cc', 'renderer/renderer_clipboard_client.h', - 'renderer/renderer_date_time_picker.cc', - 'renderer/renderer_date_time_picker.h', 'renderer/renderer_main.cc', 'renderer/renderer_main_platform_delegate.h', 'renderer/renderer_main_platform_delegate_android.cc', diff --git a/content/renderer/renderer_date_time_picker.cc b/content/renderer/android/renderer_date_time_picker.cc index 592e249..15b8332 100644 --- a/content/renderer/renderer_date_time_picker.cc +++ b/content/renderer/android/renderer_date_time_picker.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -#include "content/renderer/renderer_date_time_picker.h" +#include "content/renderer/android/renderer_date_time_picker.h" #include "base/strings/string_util.h" #include "content/common/view_messages.h" @@ -84,17 +84,13 @@ bool RendererDateTimePicker::OnMessageReceived( void RendererDateTimePicker::OnReplaceDateTime(double value) { if (chooser_completion_) chooser_completion_->didChooseValue(value); -#if defined(OS_ANDROID) static_cast<RenderViewImpl*>(render_view())->DismissDateTimeDialog(); -#endif } void RendererDateTimePicker::OnCancel() { if (chooser_completion_) chooser_completion_->didCancelChooser(); -#if defined(OS_ANDROID) static_cast<RenderViewImpl*>(render_view())->DismissDateTimeDialog(); -#endif } } // namespace content diff --git a/content/renderer/renderer_date_time_picker.h b/content/renderer/android/renderer_date_time_picker.h index 7a780c7..b0bdb50 100644 --- a/content/renderer/renderer_date_time_picker.h +++ b/content/renderer/android/renderer_date_time_picker.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_RENDERER_RENDERER_DATE_TIME_PICKER_H_ -#define CONTENT_RENDERER_RENDERER_DATE_TIME_PICKER_H_ +#ifndef CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_ +#define CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_ #include "base/basictypes.h" #include "content/public/renderer/render_view_observer.h" @@ -43,4 +43,4 @@ class RendererDateTimePicker : public RenderViewObserver { } // namespace content -#endif // CONTENT_RENDERER_RENDERER_DATE_TIME_PICKER_H_ +#endif // CONTENT_RENDERER_ANDROID_RENDERER_DATE_TIME_PICKER_H_ diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index 324c4c7..2cd5f8c 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -38,7 +38,6 @@ #include "content/renderer/mouse_lock_dispatcher.h" #include "content/renderer/render_frame_impl.h" #include "content/renderer/render_widget.h" -#include "content/renderer/renderer_date_time_picker.h" #include "content/renderer/stats_collection_observer.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" @@ -61,6 +60,7 @@ #if defined(OS_ANDROID) #include "content/renderer/android/content_detector.h" +#include "content/renderer/android/renderer_date_time_picker.h" #include "third_party/WebKit/public/web/WebContentDetectionResult.h" #endif @@ -82,10 +82,6 @@ namespace base { class CommandLine; } -namespace ui { -struct SelectedFileInfo; -} // namespace ui - namespace blink { class WebApplicationCacheHost; class WebApplicationCacheHostClient; @@ -118,6 +114,10 @@ struct WebWindowFeatures; #if defined(OS_ANDROID) class WebHitTestResult; #endif +} // namespace blink + +namespace ui { +struct SelectedFileInfo; } namespace webkit_glue { |