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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 TransportDIB** dib, 119 TransportDIB** dib,
120 gfx::Rect* location, 120 gfx::Rect* location,
121 gfx::Rect* clip, 121 gfx::Rect* clip,
122 float* scale_factor); 122 float* scale_factor);
123 void PageVisibilityChanged(bool shown); 123 void PageVisibilityChanged(bool shown);
124 void OnSetFocus(bool enable); 124 void OnSetFocus(bool enable);
125 void WillHandleMouseEvent(const blink::WebMouseEvent& event); 125 void WillHandleMouseEvent(const blink::WebMouseEvent& event);
126 126
127 // Simulates IME events for testing purpose. 127 // Simulates IME events for testing purpose.
128 void SimulateImeSetComposition( 128 void SimulateImeSetComposition(
129 const string16& text, 129 const base::string16& text,
130 const std::vector<blink::WebCompositionUnderline>& underlines, 130 const std::vector<blink::WebCompositionUnderline>& underlines,
131 int selection_start, 131 int selection_start,
132 int selection_end); 132 int selection_end);
133 void SimulateImeConfirmComposition(const string16& text, 133 void SimulateImeConfirmComposition(const base::string16& text,
134 const gfx::Range& replacement_range); 134 const gfx::Range& replacement_range);
135 135
136 // TODO(jam): remove these once the IPC handler moves from RenderView to 136 // TODO(jam): remove these once the IPC handler moves from RenderView to
137 // RenderFrame. 137 // RenderFrame.
138 void OnImeSetComposition( 138 void OnImeSetComposition(
139 const string16& text, 139 const base::string16& text,
140 const std::vector<blink::WebCompositionUnderline>& underlines, 140 const std::vector<blink::WebCompositionUnderline>& underlines,
141 int selection_start, 141 int selection_start,
142 int selection_end); 142 int selection_end);
143 void OnImeConfirmComposition( 143 void OnImeConfirmComposition(
144 const string16& text, 144 const base::string16& text,
145 const gfx::Range& replacement_range, 145 const gfx::Range& replacement_range,
146 bool keep_selection); 146 bool keep_selection);
147 147
148 PepperPluginInstanceImpl* focused_pepper_plugin() { 148 PepperPluginInstanceImpl* focused_pepper_plugin() {
149 return focused_pepper_plugin_; 149 return focused_pepper_plugin_;
150 } 150 }
151 #endif // ENABLE_PLUGINS 151 #endif // ENABLE_PLUGINS
152 152
153 // IPC::Sender 153 // IPC::Sender
154 virtual bool Send(IPC::Message* msg) OVERRIDE; 154 virtual bool Send(IPC::Message* msg) OVERRIDE;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 318
319 #if defined(ENABLE_PLUGINS) 319 #if defined(ENABLE_PLUGINS)
320 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet; 320 typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
321 PepperPluginSet active_pepper_instances_; 321 PepperPluginSet active_pepper_instances_;
322 322
323 // Whether or not the focus is on a PPAPI plugin 323 // Whether or not the focus is on a PPAPI plugin
324 PepperPluginInstanceImpl* focused_pepper_plugin_; 324 PepperPluginInstanceImpl* focused_pepper_plugin_;
325 325
326 // Current text input composition text. Empty if no composition is in 326 // Current text input composition text. Empty if no composition is in
327 // progress. 327 // progress.
328 string16 pepper_composition_text_; 328 base::string16 pepper_composition_text_;
329 329
330 // The plugin instance that received the last mouse event. It is set to NULL 330 // The plugin instance that received the last mouse event. It is set to NULL
331 // if the last mouse event went to elements other than Pepper plugins. 331 // if the last mouse event went to elements other than Pepper plugins.
332 // |pepper_last_mouse_event_target_| is not owned by this class. We can know 332 // |pepper_last_mouse_event_target_| is not owned by this class. We can know
333 // about when it is destroyed via InstanceDeleted(). 333 // about when it is destroyed via InstanceDeleted().
334 PepperPluginInstanceImpl* pepper_last_mouse_event_target_; 334 PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
335 #endif 335 #endif
336 336
337 // All the registered observers. 337 // All the registered observers.
338 ObserverList<RenderFrameObserver> observers_; 338 ObserverList<RenderFrameObserver> observers_;
339 339
340 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 340 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
341 }; 341 };
342 342
343 } // namespace content 343 } // namespace content
344 344
345 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 345 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/npapi/webplugin_delegate_proxy.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698