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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 2050623005: Move file chooser from RenderView(Host) to RenderFrame(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Some cleanup. Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 bool suppress_opener) override; 334 bool suppress_opener) override;
335 blink::WebWidget* createPopupMenu(blink::WebPopupType popup_type) override; 335 blink::WebWidget* createPopupMenu(blink::WebPopupType popup_type) override;
336 blink::WebStorageNamespace* createSessionStorageNamespace() override; 336 blink::WebStorageNamespace* createSessionStorageNamespace() override;
337 void printPage(blink::WebLocalFrame* frame) override; 337 void printPage(blink::WebLocalFrame* frame) override;
338 bool enumerateChosenDirectory( 338 bool enumerateChosenDirectory(
339 const blink::WebString& path, 339 const blink::WebString& path,
340 blink::WebFileChooserCompletion* chooser_completion) override; 340 blink::WebFileChooserCompletion* chooser_completion) override;
341 void saveImageFromDataURL(const blink::WebString& data_url) override; 341 void saveImageFromDataURL(const blink::WebString& data_url) override;
342 void didCancelCompositionOnSelectionChange() override; 342 void didCancelCompositionOnSelectionChange() override;
343 bool handleCurrentKeyboardEvent() override; 343 bool handleCurrentKeyboardEvent() override;
344 bool runFileChooser(
345 const blink::WebFileChooserParams& params,
346 blink::WebFileChooserCompletion* chooser_completion) override;
347 void SetValidationMessageDirection(base::string16* main_text, 344 void SetValidationMessageDirection(base::string16* main_text,
348 blink::WebTextDirection main_text_hint, 345 blink::WebTextDirection main_text_hint,
349 base::string16* sub_text, 346 base::string16* sub_text,
350 blink::WebTextDirection sub_text_hint); 347 blink::WebTextDirection sub_text_hint);
351 void showValidationMessage(const blink::WebRect& anchor_in_viewport, 348 void showValidationMessage(const blink::WebRect& anchor_in_viewport,
352 const blink::WebString& main_text, 349 const blink::WebString& main_text,
353 blink::WebTextDirection main_text_hint, 350 blink::WebTextDirection main_text_hint,
354 const blink::WebString& sub_text, 351 const blink::WebString& sub_text,
355 blink::WebTextDirection hint) override; 352 blink::WebTextDirection hint) override;
356 void hideValidationMessage() override; 353 void hideValidationMessage() override;
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 void OnDragTargetDragLeave(); 627 void OnDragTargetDragLeave();
631 void OnDragTargetDragOver(const gfx::Point& client_pt, 628 void OnDragTargetDragOver(const gfx::Point& client_pt,
632 const gfx::Point& screen_pt, 629 const gfx::Point& screen_pt,
633 blink::WebDragOperationsMask operations_allowed, 630 blink::WebDragOperationsMask operations_allowed,
634 int key_modifiers); 631 int key_modifiers);
635 void OnEnablePreferredSizeChangedMode(); 632 void OnEnablePreferredSizeChangedMode();
636 void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size); 633 void OnEnableAutoResize(const gfx::Size& min_size, const gfx::Size& max_size);
637 void OnDisableAutoResize(const gfx::Size& new_size); 634 void OnDisableAutoResize(const gfx::Size& new_size);
638 void OnEnumerateDirectoryResponse(int id, 635 void OnEnumerateDirectoryResponse(int id,
639 const std::vector<base::FilePath>& paths); 636 const std::vector<base::FilePath>& paths);
640 void OnFileChooserResponse(
641 const std::vector<content::FileChooserFileInfo>& files);
642 void OnMediaPlayerActionAt(const gfx::Point& location, 637 void OnMediaPlayerActionAt(const gfx::Point& location,
643 const blink::WebMediaPlayerAction& action); 638 const blink::WebMediaPlayerAction& action);
644 void OnPluginActionAt(const gfx::Point& location, 639 void OnPluginActionAt(const gfx::Point& location,
645 const blink::WebPluginAction& action); 640 const blink::WebPluginAction& action);
646 void OnMoveOrResizeStarted(); 641 void OnMoveOrResizeStarted();
647 void OnReleaseDisambiguationPopupBitmap(const cc::SharedBitmapId& id); 642 void OnReleaseDisambiguationPopupBitmap(const cc::SharedBitmapId& id);
648 void OnResetPageEncodingToDefault(); 643 void OnResetPageEncodingToDefault();
649 void OnSetActive(bool active); 644 void OnSetActive(bool active);
650 void OnSetBackgroundOpaque(bool opaque); 645 void OnSetBackgroundOpaque(bool opaque);
651 void OnExitFullscreen(); 646 void OnExitFullscreen();
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 // List of click-based content detectors. 898 // List of click-based content detectors.
904 std::vector<std::unique_ptr<ContentDetector>> content_detectors_; 899 std::vector<std::unique_ptr<ContentDetector>> content_detectors_;
905 900
906 // A date/time picker object for date and time related input elements. 901 // A date/time picker object for date and time related input elements.
907 std::unique_ptr<RendererDateTimePicker> date_time_picker_client_; 902 std::unique_ptr<RendererDateTimePicker> date_time_picker_client_;
908 903
909 #endif 904 #endif
910 905
911 // Misc ---------------------------------------------------------------------- 906 // Misc ----------------------------------------------------------------------
912 907
913 // The current and pending file chooser completion objects. If the queue is
914 // nonempty, the first item represents the currently running file chooser
915 // callback, and the remaining elements are the other file chooser completion
916 // still waiting to be run (in order).
917 struct PendingFileChooser;
918 std::deque<std::unique_ptr<PendingFileChooser>> file_chooser_completions_;
919
920 // The current directory enumeration callback 908 // The current directory enumeration callback
921 std::map<int, blink::WebFileChooserCompletion*> enumeration_completions_; 909 std::map<int, blink::WebFileChooserCompletion*> enumeration_completions_;
922 int enumeration_completion_id_; 910 int enumeration_completion_id_;
923 911
924 // The SessionStorage namespace that we're assigned to has an ID, and that ID 912 // The SessionStorage namespace that we're assigned to has an ID, and that ID
925 // is passed to us upon creation. WebKit asks for this ID upon first use and 913 // is passed to us upon creation. WebKit asks for this ID upon first use and
926 // uses it whenever asking the browser process to allocate new storage areas. 914 // uses it whenever asking the browser process to allocate new storage areas.
927 int64_t session_storage_namespace_id_; 915 int64_t session_storage_namespace_id_;
928 916
929 // Stores edit commands associated to the next key event. 917 // Stores edit commands associated to the next key event.
(...skipping 24 matching lines...) Expand all
954 // use the Observer interface to filter IPC messages and receive frame change 942 // use the Observer interface to filter IPC messages and receive frame change
955 // notifications. 943 // notifications.
956 // --------------------------------------------------------------------------- 944 // ---------------------------------------------------------------------------
957 945
958 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 946 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
959 }; 947 };
960 948
961 } // namespace content 949 } // namespace content
962 950
963 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 951 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698