| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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> |
| 11 #include <atlcrack.h> | 11 #include <atlcrack.h> |
| 12 #include <atlmisc.h> | 12 #include <atlmisc.h> |
| 13 | 13 |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/scoped_comptr_win.h" | 16 #include "base/scoped_comptr_win.h" |
| 17 #include "base/scoped_ptr.h" | 17 #include "base/scoped_ptr.h" |
| 18 #include "base/scoped_vector.h" | 18 #include "base/scoped_vector.h" |
| 19 #include "base/task.h" | 19 #include "base/task.h" |
| 20 #include "chrome/browser/accessibility/browser_accessibility_manager.h" | 20 #include "chrome/browser/accessibility/browser_accessibility_manager.h" |
| 21 #include "chrome/browser/ime_input.h" | 21 #include "chrome/browser/ime_input.h" |
| 22 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 22 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
| 23 #include "chrome/common/notification_observer.h" | 23 #include "chrome/common/notification_observer.h" |
| 24 #include "chrome/common/notification_registrar.h" | 24 #include "chrome/common/notification_registrar.h" |
| 25 #include "webkit/glue/webcursor.h" | 25 #include "webkit/glue/webcursor.h" |
| 26 | 26 |
| 27 namespace app { | 27 namespace app { |
| 28 |
| 29 class ViewProp; |
| 30 |
| 28 namespace win { | 31 namespace win { |
| 29 class ScopedProp; | 32 class ScopedProp; |
| 30 } | 33 } |
| 31 } | 34 } |
| 32 | 35 |
| 33 namespace gfx { | 36 namespace gfx { |
| 34 class Size; | 37 class Size; |
| 35 class Rect; | 38 class Rect; |
| 36 } | 39 } |
| 37 | 40 |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 // whenever we paint. | 336 // whenever we paint. |
| 334 bool visually_deemphasized_; | 337 bool visually_deemphasized_; |
| 335 | 338 |
| 336 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events. | 339 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events. |
| 337 NotificationRegistrar registrar_; | 340 NotificationRegistrar registrar_; |
| 338 | 341 |
| 339 // Stores the current text input type received by ImeUpdateTextInputState() | 342 // Stores the current text input type received by ImeUpdateTextInputState() |
| 340 // method. | 343 // method. |
| 341 WebKit::WebTextInputType text_input_type_; | 344 WebKit::WebTextInputType text_input_type_; |
| 342 | 345 |
| 343 ScopedVector<app::win::ScopedProp> props_; | 346 ScopedVector<app::ViewProp> props_; |
| 347 scoped_ptr<app::win::ScopedProp> renderer_id_prop_; |
| 344 | 348 |
| 345 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); | 349 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); |
| 346 }; | 350 }; |
| 347 | 351 |
| 348 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ | 352 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ |
| OLD | NEW |