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

Side by Side Diff: ui/app_list/cocoa/app_list_window_controller_unittest.mm

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "base/mac/scoped_nsobject.h" 5 #import "base/mac/scoped_nsobject.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #import "testing/gtest_mac.h" 7 #import "testing/gtest_mac.h"
8 #include "ui/app_list/app_list_view_delegate.h" 8 #include "ui/app_list/app_list_view_delegate.h"
9 #import "ui/app_list/cocoa/app_list_view_controller.h" 9 #import "ui/app_list/cocoa/app_list_view_controller.h"
10 #import "ui/app_list/cocoa/app_list_window_controller.h" 10 #import "ui/app_list/cocoa/app_list_window_controller.h"
11 #include "ui/app_list/search_box_model.h" 11 #include "ui/app_list/search_box_model.h"
12 #include "ui/app_list/test/app_list_test_view_delegate.h" 12 #include "ui/app_list/test/app_list_test_view_delegate.h"
13 #import "ui/gfx/test/ui_cocoa_test_helper.h" 13 #import "ui/gfx/test/ui_cocoa_test_helper.h"
14 14
15 namespace { 15 namespace {
16 16
17 class AppListWindowControllerTest : public ui::CocoaTest { 17 class AppListWindowControllerTest : public ui::CocoaTest {
18 public: 18 public:
19 AppListWindowControllerTest(); 19 AppListWindowControllerTest();
20 20
21 protected: 21 protected:
22 virtual void TearDown() OVERRIDE; 22 virtual void TearDown() override;
23 23
24 base::scoped_nsobject<AppListWindowController> controller_; 24 base::scoped_nsobject<AppListWindowController> controller_;
25 25
26 app_list::test::AppListTestViewDelegate* delegate() { 26 app_list::test::AppListTestViewDelegate* delegate() {
27 return delegate_.get(); 27 return delegate_.get();
28 } 28 }
29 29
30 private: 30 private:
31 scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_; 31 scoped_ptr<app_list::test::AppListTestViewDelegate> delegate_;
32 32
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 EXPECT_TRUE([view_controller showingSearchResults]); 85 EXPECT_TRUE([view_controller showingSearchResults]);
86 86
87 EXPECT_EQ(0, delegate()->open_search_result_count()); 87 EXPECT_EQ(0, delegate()->open_search_result_count());
88 [view_controller openResult:nil]; 88 [view_controller openResult:nil];
89 EXPECT_EQ(1, delegate()->open_search_result_count()); 89 EXPECT_EQ(1, delegate()->open_search_result_count());
90 90
91 EXPECT_TRUE([view_controller showingSearchResults]); 91 EXPECT_TRUE([view_controller showingSearchResults]);
92 [[controller_ window] close]; // Hide. 92 [[controller_ window] close]; // Hide.
93 EXPECT_FALSE([view_controller showingSearchResults]); 93 EXPECT_FALSE([view_controller showingSearchResults]);
94 } 94 }
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/app_list_view_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_grid_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698