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

Side by Side Diff: ash/wm/partial_screenshot_view_unittest.cc

Issue 14696007: Warn on missing OVERRIDE/virtual everywhere, not just in header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: new regressions, attempt 3 Created 7 years, 7 months 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 | « ash/shell/app_list.cc ('k') | base/debug/trace_event_impl.cc » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ash/wm/partial_screenshot_view.h" 5 #include "ash/wm/partial_screenshot_view.h"
6 6
7 #include "ash/screenshot_delegate.h" 7 #include "ash/screenshot_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ui/aura/root_window.h" 11 #include "ui/aura/root_window.h"
12 #include "ui/aura/test/event_generator.h" 12 #include "ui/aura/test/event_generator.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 class FakeScreenshotDelegate : public ScreenshotDelegate { 16 class FakeScreenshotDelegate : public ScreenshotDelegate {
17 public: 17 public:
18 FakeScreenshotDelegate() : screenshot_count_(0) {} 18 FakeScreenshotDelegate() : screenshot_count_(0) {}
19 19
20 void HandleTakeScreenshotForAllRootWindows() OVERRIDE {} 20 virtual void HandleTakeScreenshotForAllRootWindows() OVERRIDE {}
21 void HandleTakePartialScreenshot(aura::Window* window, 21 virtual void HandleTakePartialScreenshot(aura::Window* window,
22 const gfx::Rect& rect) OVERRIDE { 22 const gfx::Rect& rect) OVERRIDE {
23 rect_ = rect; 23 rect_ = rect;
24 screenshot_count_++; 24 screenshot_count_++;
25 } 25 }
26 26
27 bool CanTakeScreenshot() OVERRIDE { 27 virtual bool CanTakeScreenshot() OVERRIDE {
28 return true; 28 return true;
29 } 29 }
30 30
31 const gfx::Rect& rect() const { return rect_; }; 31 const gfx::Rect& rect() const { return rect_; };
32 int screenshot_count() const { return screenshot_count_; }; 32 int screenshot_count() const { return screenshot_count_; };
33 33
34 private: 34 private:
35 gfx::Rect rect_; 35 gfx::Rect rect_;
36 int screenshot_count_; 36 int screenshot_count_;
37 37
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 EXPECT_TRUE(view_->is_dragging_); 94 EXPECT_TRUE(view_->is_dragging_);
95 EXPECT_EQ("200,200", view_->current_position_.ToString()); 95 EXPECT_EQ("200,200", view_->current_position_.ToString());
96 96
97 generator.ReleaseTouch(); 97 generator.ReleaseTouch();
98 EXPECT_FALSE(view_->is_dragging_); 98 EXPECT_FALSE(view_->is_dragging_);
99 EXPECT_EQ(1, delegate_->screenshot_count()); 99 EXPECT_EQ(1, delegate_->screenshot_count());
100 EXPECT_EQ("100,100 100x100", delegate_->rect().ToString()); 100 EXPECT_EQ("100,100 100x100", delegate_->rect().ToString());
101 } 101 }
102 102
103 } // namespace ash 103 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/app_list.cc ('k') | base/debug/trace_event_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698