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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.h

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 9 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
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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const WebKit::WebMouseWheelEvent& event) OVERRIDE; 92 const WebKit::WebMouseWheelEvent& event) OVERRIDE;
93 virtual void SetHasHorizontalScrollbar( 93 virtual void SetHasHorizontalScrollbar(
94 bool has_horizontal_scrollbar) OVERRIDE; 94 bool has_horizontal_scrollbar) OVERRIDE;
95 virtual void SetScrollOffsetPinning( 95 virtual void SetScrollOffsetPinning(
96 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 96 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
97 virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE; 97 virtual gfx::PluginWindowHandle GetCompositingSurface() OVERRIDE;
98 virtual bool LockMouse() OVERRIDE; 98 virtual bool LockMouse() OVERRIDE;
99 virtual void UnlockMouse() OVERRIDE; 99 virtual void UnlockMouse() OVERRIDE;
100 100
101 // Overridden from aura::WindowDelegate: 101 // Overridden from aura::WindowDelegate:
102 virtual void OnBoundsChanging(gfx::Rect* new_bounds) OVERRIDE;
102 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 103 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
103 const gfx::Rect& new_bounds); 104 const gfx::Rect& new_bounds) OVERRIDE;
104 virtual void OnFocus() OVERRIDE; 105 virtual void OnFocus() OVERRIDE;
105 virtual void OnBlur() OVERRIDE; 106 virtual void OnBlur() OVERRIDE;
106 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; 107 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE;
107 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 108 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
108 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 109 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
109 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; 110 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE;
110 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; 111 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE;
111 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; 112 virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
112 virtual void OnActivated() OVERRIDE; 113 virtual void OnActivated() OVERRIDE;
113 virtual void OnLostActive() OVERRIDE; 114 virtual void OnLostActive() OVERRIDE;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> > 157 std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >
157 accelerated_surface_containers_; 158 accelerated_surface_containers_;
158 #endif 159 #endif
159 160
160 bool skip_schedule_paint_; 161 bool skip_schedule_paint_;
161 162
162 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura); 163 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
163 }; 164 };
164 165
165 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_ 166 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view_browsertest.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698