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

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

Issue 5184009: Revert 66784 - Converts usage of SetProp/GetProp to a map. Even after making ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
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
31 namespace win { 28 namespace win {
32 class ScopedProp; 29 class ScopedProp;
33 } 30 }
34 } 31 }
35 32
36 namespace gfx { 33 namespace gfx {
37 class Size; 34 class Size;
38 class Rect; 35 class Rect;
39 } 36 }
40 37
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // whenever we paint. 333 // whenever we paint.
337 bool visually_deemphasized_; 334 bool visually_deemphasized_;
338 335
339 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events. 336 // Registrar so we can listen to RENDERER_PROCESS_TERMINATED events.
340 NotificationRegistrar registrar_; 337 NotificationRegistrar registrar_;
341 338
342 // Stores the current text input type received by ImeUpdateTextInputState() 339 // Stores the current text input type received by ImeUpdateTextInputState()
343 // method. 340 // method.
344 WebKit::WebTextInputType text_input_type_; 341 WebKit::WebTextInputType text_input_type_;
345 342
346 ScopedVector<app::ViewProp> props_; 343 ScopedVector<app::win::ScopedProp> props_;
347 scoped_ptr<app::win::ScopedProp> renderer_id_prop_;
348 344
349 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); 345 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
350 }; 346 };
351 347
352 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 348 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/external_tab_container_win.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698