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

Side by Side Diff: ui/aura/test/test_window_delegate.cc

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
« no previous file with comments | « ui/aura/test/test_window_delegate.h ('k') | ui/aura/window.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/aura/test/test_window_delegate.h" 5 #include "ui/aura/test/test_window_delegate.h"
6 6
7 #include "third_party/skia/include/core/SkCanvas.h" 7 #include "third_party/skia/include/core/SkCanvas.h"
8 #include "ui/aura/event.h" 8 #include "ui/aura/event.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/base/hit_test.h" 10 #include "ui/base/hit_test.h"
11 #include "ui/gfx/canvas.h" 11 #include "ui/gfx/canvas.h"
12 12
13 namespace aura { 13 namespace aura {
14 namespace test { 14 namespace test {
15 15
16 //////////////////////////////////////////////////////////////////////////////// 16 ////////////////////////////////////////////////////////////////////////////////
17 // TestWindowDelegate 17 // TestWindowDelegate
18 18
19 TestWindowDelegate::TestWindowDelegate() { 19 TestWindowDelegate::TestWindowDelegate() {
20 } 20 }
21 21
22 TestWindowDelegate::~TestWindowDelegate() { 22 TestWindowDelegate::~TestWindowDelegate() {
23 } 23 }
24 24
25 void TestWindowDelegate::OnBoundsChanging(gfx::Rect* new_bounds) {
26 }
27
25 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds, 28 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
26 const gfx::Rect& new_bounds) { 29 const gfx::Rect& new_bounds) {
27 } 30 }
28 31
29 void TestWindowDelegate::OnFocus() { 32 void TestWindowDelegate::OnFocus() {
30 } 33 }
31 34
32 void TestWindowDelegate::OnBlur() { 35 void TestWindowDelegate::OnBlur() {
33 } 36 }
34 37
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 } 125 }
123 void ActivateWindowDelegate::OnActivated() { 126 void ActivateWindowDelegate::OnActivated() {
124 activated_count_++; 127 activated_count_++;
125 } 128 }
126 void ActivateWindowDelegate::OnLostActive() { 129 void ActivateWindowDelegate::OnLostActive() {
127 lost_active_count_++; 130 lost_active_count_++;
128 } 131 }
129 132
130 } // namespace test 133 } // namespace test
131 } // namespace aura 134 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/test_window_delegate.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698