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

Side by Side Diff: chrome/browser/ui/cocoa/panels/panel_cocoa_unittest.mm

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <Carbon/Carbon.h> 5 #include <Carbon/Carbon.h>
6 #import <Cocoa/Cocoa.h> 6 #import <Cocoa/Cocoa.h>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "base/mac/scoped_nsautorelease_pool.h" 10 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 15 matching lines...) Expand all
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 #include "testing/gtest_mac.h" 27 #include "testing/gtest_mac.h"
28 28
29 class PanelAnimatedBoundsObserver : 29 class PanelAnimatedBoundsObserver :
30 public content::WindowedNotificationObserver { 30 public content::WindowedNotificationObserver {
31 public: 31 public:
32 PanelAnimatedBoundsObserver(Panel* panel) 32 PanelAnimatedBoundsObserver(Panel* panel)
33 : content::WindowedNotificationObserver( 33 : content::WindowedNotificationObserver(
34 chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, 34 chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
35 content::Source<Panel>(panel)) { } 35 content::Source<Panel>(panel)) { }
36 virtual ~PanelAnimatedBoundsObserver() { } 36 ~PanelAnimatedBoundsObserver() override {}
37 }; 37 };
38 38
39 // Main test class. 39 // Main test class.
40 class PanelCocoaTest : public CocoaProfileTest { 40 class PanelCocoaTest : public CocoaProfileTest {
41 public: 41 public:
42 virtual void SetUp() { 42 virtual void SetUp() {
43 CocoaProfileTest::SetUp(); 43 CocoaProfileTest::SetUp();
44 } 44 }
45 45
46 Panel* CreateTestPanel(const std::string& panel_name) { 46 Panel* CreateTestPanel(const std::string& panel_name) {
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; 401 NSWindow* frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
402 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]); 402 EXPECT_NSEQ(frontmostWindow, [native_window->controller_ window]);
403 403
404 native_window2->ActivatePanel(); 404 native_window2->ActivatePanel();
405 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0]; 405 frontmostWindow = [[NSApp orderedWindows] objectAtIndex:0];
406 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]); 406 EXPECT_NSEQ(frontmostWindow, [native_window2->controller_ window]);
407 407
408 ClosePanelAndWait(panel); 408 ClosePanelAndWait(panel);
409 ClosePanelAndWait(panel2); 409 ClosePanelAndWait(panel2);
410 } 410 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698