Relanding 49339 ...

chrome/browser/renderer_host/render_widget_host_view_win.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
+#include <vector>
+
 #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 {
@@ skipping 219 matching lines @@
   // will be tiled such that it lines up with existing tiles starting from the
   // origin of |dc|.
   void DrawBackground(const RECT& rect, CPaintDC* dc);
 
   // Create an intermediate window between the given HWND and its parent.
   HWND ReparentWindow(HWND window);
 
   // Whether the window should be activated.
   bool IsActivatable() const;
 
+  // MSAA IAccessible returned while page contents is loading.
+  ScopedComPtr<IAccessible> loading_accessible_;
+
   // The associated Model.
   RenderWidgetHost* render_widget_host_;
 
   // If we're doing out-of-process painting, this member will be non-NULL,
   // indicating the gpu view we're using for the painting.
   scoped_ptr<GpuViewHost> gpu_view_host_;
 
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;
 
@@ skipping 51 matching lines @@
 
   // Instance of accessibility information for the root of the MSAA
   // tree representation of the WebKit render tree.
   scoped_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
 
   // 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
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
-  // Whether the renderer is made accessible.
-  // TODO(jcampan): http://b/issue?id=1432077 This is a temporary work-around
-  // until that bug is fixed.
-  bool renderer_accessible_;
-
   // The time it took after this view was selected for it to be fully painted.
   base::TimeTicks tab_switch_paint_time_;
 
   // True if we are showing a constrained window. We will grey out the view
   // whenever we paint.
   bool visually_deemphasized_;
 
   // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_