| Index: chrome/browser/renderer_host/render_widget_host_view_win.h
|
| ===================================================================
|
| --- chrome/browser/renderer_host/render_widget_host_view_win.h (revision 46641)
|
| +++ chrome/browser/renderer_host/render_widget_host_view_win.h (working copy)
|
| @@ -13,10 +13,8 @@
|
| #include "base/scoped_comptr_win.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/task.h"
|
| -#include "chrome/browser/browser_accessibility_manager.h"
|
| #include "chrome/browser/ime_input.h"
|
| #include "chrome/browser/renderer_host/render_widget_host_view.h"
|
| -#include "chrome/common/notification_registrar.h"
|
| #include "webkit/glue/webcursor.h"
|
|
|
| namespace gfx {
|
| @@ -57,8 +55,7 @@
|
| : public CWindowImpl<RenderWidgetHostViewWin,
|
| CWindow,
|
| RenderWidgetHostHWNDTraits>,
|
| - public RenderWidgetHostView,
|
| - public NotificationObserver {
|
| + public RenderWidgetHostView {
|
| public:
|
| // The view will associate itself with the given widget.
|
| explicit RenderWidgetHostViewWin(RenderWidgetHost* widget);
|
| @@ -144,16 +141,7 @@
|
| virtual void SetBackground(const SkBitmap& background);
|
| virtual bool ContainsNativeView(gfx::NativeView native_view) const;
|
| virtual void SetVisuallyDeemphasized(bool deemphasized);
|
| - virtual void UpdateAccessibilityTree(
|
| - const webkit_glue::WebAccessibility& tree);
|
| - virtual void OnAccessibilityFocusChange(int acc_obj_id);
|
| - virtual void OnAccessibilityObjectStateChange(int acc_obj_id);
|
|
|
| - // Implementation of NotificationObserver:
|
| - virtual void Observe(NotificationType type,
|
| - const NotificationSource& source,
|
| - const NotificationDetails& details);
|
| -
|
| protected:
|
| // Windows Message Handlers
|
| LRESULT OnCreate(CREATESTRUCT* create_struct);
|
| @@ -308,7 +296,7 @@
|
|
|
| // Instance of accessibility information for the root of the MSAA
|
| // tree representation of the WebKit render tree.
|
| - scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
|
| + ScopedComPtr<IAccessible> browser_accessibility_root_;
|
|
|
| // The time at which this view started displaying white pixels as a result of
|
| // not having anything to paint (empty backing store from renderer). This
|
| @@ -327,9 +315,6 @@
|
| // whenever we paint.
|
| bool visually_deemphasized_;
|
|
|
| - // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events.
|
| - NotificationRegistrar registrar_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
|
| };
|
|
|
|
|