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

Side by Side Diff: views/widget/native_widget_aura.h

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura bots 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 VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE; 114 virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE;
115 virtual bool ConvertPointFromAncestor( 115 virtual bool ConvertPointFromAncestor(
116 const Widget* ancestor, gfx::Point* point) const OVERRIDE; 116 const Widget* ancestor, gfx::Point* point) const OVERRIDE;
117 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE; 117 virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE;
118 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE; 118 virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE;
119 119
120 // Overridden from views::InputMethodDelegate: 120 // Overridden from views::InputMethodDelegate:
121 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; 121 virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
122 122
123 // Overridden from aura::WindowDelegate: 123 // Overridden from aura::WindowDelegate:
124 virtual void OnBoundsChanging(gfx::Rect* new_bounds) OVERRIDE;
124 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, 125 virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
125 const gfx::Rect& new_bounds) OVERRIDE; 126 const gfx::Rect& new_bounds) OVERRIDE;
126 virtual void OnFocus() OVERRIDE; 127 virtual void OnFocus() OVERRIDE;
127 virtual void OnBlur() OVERRIDE; 128 virtual void OnBlur() OVERRIDE;
128 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE; 129 virtual bool OnKeyEvent(aura::KeyEvent* event) OVERRIDE;
129 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; 130 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
130 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; 131 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
131 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; 132 virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE;
132 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE; 133 virtual ui::TouchStatus OnTouchEvent(aura::TouchEvent* event) OVERRIDE;
133 virtual bool ShouldActivate(aura::Event* event) OVERRIDE; 134 virtual bool ShouldActivate(aura::Event* event) OVERRIDE;
(...skipping 27 matching lines...) Expand all
161 scoped_ptr<TooltipManagerViews> tooltip_manager_; 162 scoped_ptr<TooltipManagerViews> tooltip_manager_;
162 163
163 scoped_ptr<DesktopObserverImpl> desktop_observer_; 164 scoped_ptr<DesktopObserverImpl> desktop_observer_;
164 165
165 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 166 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
166 }; 167 };
167 168
168 } // namespace views 169 } // namespace views
169 170
170 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 171 #endif // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698