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

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

Issue 1457963002: Use scoped_ptr instead of linked_ptr from /content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile error Created 5 years, 1 month 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 <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
16 #include "base/id_map.h" 16 #include "base/id_map.h"
17 #include "base/memory/linked_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
19 #include "base/observer_list.h" 19 #include "base/observer_list.h"
20 #include "base/process/process.h" 20 #include "base/process/process.h"
21 #include "base/strings/string16.h" 21 #include "base/strings/string16.h"
22 #include "base/timer/timer.h" 22 #include "base/timer/timer.h"
23 #include "build/build_config.h" 23 #include "build/build_config.h"
24 #include "cc/input/top_controls_state.h" 24 #include "cc/input/top_controls_state.h"
25 #include "cc/resources/shared_bitmap.h" 25 #include "cc/resources/shared_bitmap.h"
26 #include "content/common/content_export.h" 26 #include "content/common/content_export.h"
27 #include "content/common/drag_event_source_info.h" 27 #include "content/common/drag_event_source_info.h"
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 scoped_ptr<HistoryController> history_controller_; 928 scoped_ptr<HistoryController> history_controller_;
929 929
930 #if defined(OS_ANDROID) 930 #if defined(OS_ANDROID)
931 // Android Specific --------------------------------------------------------- 931 // Android Specific ---------------------------------------------------------
932 932
933 // Expected id of the next content intent launched. Used to prevent scheduled 933 // Expected id of the next content intent launched. Used to prevent scheduled
934 // intents to be launched if aborted. 934 // intents to be launched if aborted.
935 size_t expected_content_intent_id_; 935 size_t expected_content_intent_id_;
936 936
937 // List of click-based content detectors. 937 // List of click-based content detectors.
938 typedef std::vector< linked_ptr<ContentDetector> > ContentDetectorList; 938 std::vector<scoped_ptr<ContentDetector>> content_detectors_;
939 ContentDetectorList content_detectors_;
940 939
941 // A date/time picker object for date and time related input elements. 940 // A date/time picker object for date and time related input elements.
942 scoped_ptr<RendererDateTimePicker> date_time_picker_client_; 941 scoped_ptr<RendererDateTimePicker> date_time_picker_client_;
943 #endif 942 #endif
944 943
945 // Plugins ------------------------------------------------------------------- 944 // Plugins -------------------------------------------------------------------
946 945
947 // All the currently active plugin delegates for this RenderView; kept so 946 // All the currently active plugin delegates for this RenderView; kept so
948 // that we can enumerate them to send updates about things like window 947 // that we can enumerate them to send updates about things like window
949 // location or tab focus and visibily. These are non-owning references. 948 // location or tab focus and visibily. These are non-owning references.
(...skipping 25 matching lines...) Expand all
975 PepperPluginInstanceImpl* pepper_last_mouse_event_target_; 974 PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
976 #endif 975 #endif
977 976
978 // Misc ---------------------------------------------------------------------- 977 // Misc ----------------------------------------------------------------------
979 978
980 // The current and pending file chooser completion objects. If the queue is 979 // The current and pending file chooser completion objects. If the queue is
981 // nonempty, the first item represents the currently running file chooser 980 // nonempty, the first item represents the currently running file chooser
982 // callback, and the remaining elements are the other file chooser completion 981 // callback, and the remaining elements are the other file chooser completion
983 // still waiting to be run (in order). 982 // still waiting to be run (in order).
984 struct PendingFileChooser; 983 struct PendingFileChooser;
985 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_; 984 std::deque<scoped_ptr<PendingFileChooser>> file_chooser_completions_;
986 985
987 // The current directory enumeration callback 986 // The current directory enumeration callback
988 std::map<int, blink::WebFileChooserCompletion*> enumeration_completions_; 987 std::map<int, blink::WebFileChooserCompletion*> enumeration_completions_;
989 int enumeration_completion_id_; 988 int enumeration_completion_id_;
990 989
991 // The SessionStorage namespace that we're assigned to has an ID, and that ID 990 // The SessionStorage namespace that we're assigned to has an ID, and that ID
992 // is passed to us upon creation. WebKit asks for this ID upon first use and 991 // is passed to us upon creation. WebKit asks for this ID upon first use and
993 // uses it whenever asking the browser process to allocate new storage areas. 992 // uses it whenever asking the browser process to allocate new storage areas.
994 int64 session_storage_namespace_id_; 993 int64 session_storage_namespace_id_;
995 994
(...skipping 28 matching lines...) Expand all
1024 // use the Observer interface to filter IPC messages and receive frame change 1023 // use the Observer interface to filter IPC messages and receive frame change
1025 // notifications. 1024 // notifications.
1026 // --------------------------------------------------------------------------- 1025 // ---------------------------------------------------------------------------
1027 1026
1028 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1027 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1029 }; 1028 };
1030 1029
1031 } // namespace content 1030 } // namespace content
1032 1031
1033 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1032 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/presentation/presentation_dispatcher.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698