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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_win.h

Issue 7041003: Show composition text on IME panel when Pepper plugin is focused (Linux). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A todo comment is reworded to be more correct. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
7 #pragma once 7 #pragma once
8 8
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlapp.h> 10 #include <atlapp.h>
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE; 139 const std::vector<webkit::npapi::WebPluginGeometry>& moves) OVERRIDE;
140 virtual void Focus() OVERRIDE; 140 virtual void Focus() OVERRIDE;
141 virtual void Blur() OVERRIDE; 141 virtual void Blur() OVERRIDE;
142 virtual bool HasFocus() OVERRIDE; 142 virtual bool HasFocus() OVERRIDE;
143 virtual void Show() OVERRIDE; 143 virtual void Show() OVERRIDE;
144 virtual void Hide() OVERRIDE; 144 virtual void Hide() OVERRIDE;
145 virtual bool IsShowing() OVERRIDE; 145 virtual bool IsShowing() OVERRIDE;
146 virtual gfx::Rect GetViewBounds() const OVERRIDE; 146 virtual gfx::Rect GetViewBounds() const OVERRIDE;
147 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE; 147 virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
148 virtual void SetIsLoading(bool is_loading) OVERRIDE; 148 virtual void SetIsLoading(bool is_loading) OVERRIDE;
149 virtual void ImeUpdateTextInputState(WebKit::WebTextInputType type, 149 virtual void ImeUpdateTextInputState(ui::TextInputType type,
150 bool can_compose_inline,
150 const gfx::Rect& caret_rect) OVERRIDE; 151 const gfx::Rect& caret_rect) OVERRIDE;
151 virtual void ImeCancelComposition() OVERRIDE; 152 virtual void ImeCancelComposition() OVERRIDE;
152 virtual void DidUpdateBackingStore( 153 virtual void DidUpdateBackingStore(
153 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy, 154 const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
154 const std::vector<gfx::Rect>& copy_rects) OVERRIDE; 155 const std::vector<gfx::Rect>& copy_rects) OVERRIDE;
155 virtual void RenderViewGone(base::TerminationStatus status, 156 virtual void RenderViewGone(base::TerminationStatus status,
156 int error_code) OVERRIDE; 157 int error_code) OVERRIDE;
157 // called by TabContents before DestroyWindow 158 // called by TabContents before DestroyWindow
158 virtual void WillWmDestroy() OVERRIDE; 159 virtual void WillWmDestroy() OVERRIDE;
159 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE; 160 virtual void WillDestroyRenderWidget(RenderWidgetHost* rwh) OVERRIDE;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 354
354 // A color we use to shade the entire render view. If 100% transparent, we do 355 // A color we use to shade the entire render view. If 100% transparent, we do
355 // not shade the render view. 356 // not shade the render view.
356 SkColor overlay_color_; 357 SkColor overlay_color_;
357 358
358 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events. 359 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events.
359 NotificationRegistrar registrar_; 360 NotificationRegistrar registrar_;
360 361
361 // Stores the current text input type received by ImeUpdateTextInputState() 362 // Stores the current text input type received by ImeUpdateTextInputState()
362 // method. 363 // method.
363 WebKit::WebTextInputType text_input_type_; 364 ui::TextInputType text_input_type_;
364 365
365 ScopedVector<ui::ViewProp> props_; 366 ScopedVector<ui::ViewProp> props_;
366 367
367 scoped_ptr<ui::ViewProp> accessibility_prop_; 368 scoped_ptr<ui::ViewProp> accessibility_prop_;
368 369
369 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); 370 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
370 }; 371 };
371 372
372 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 373 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698