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

Side by Side Diff: ui/app_list/cocoa/app_list_view_controller.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 "ui/app_list/cocoa/app_list_view_controller.h" 5 #import "ui/app_list/cocoa/app_list_view_controller.h"
6 6
7 #include "base/mac/foundation_util.h" 7 #include "base/mac/foundation_util.h"
8 #include "base/mac/mac_util.h" 8 #include "base/mac/mac_util.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 namespace app_list { 81 namespace app_list {
82 82
83 class AppListModelObserverBridge : public AppListViewDelegateObserver { 83 class AppListModelObserverBridge : public AppListViewDelegateObserver {
84 public: 84 public:
85 AppListModelObserverBridge(AppListViewController* parent); 85 AppListModelObserverBridge(AppListViewController* parent);
86 virtual ~AppListModelObserverBridge(); 86 virtual ~AppListModelObserverBridge();
87 87
88 private: 88 private:
89 // Overridden from app_list::AppListViewDelegateObserver: 89 // Overridden from app_list::AppListViewDelegateObserver:
90 virtual void OnProfilesChanged() OVERRIDE; 90 virtual void OnProfilesChanged() override;
91 virtual void OnShutdown() OVERRIDE; 91 virtual void OnShutdown() override;
92 92
93 AppListViewController* parent_; // Weak. Owns us. 93 AppListViewController* parent_; // Weak. Owns us.
94 94
95 DISALLOW_COPY_AND_ASSIGN(AppListModelObserverBridge); 95 DISALLOW_COPY_AND_ASSIGN(AppListModelObserverBridge);
96 }; 96 };
97 97
98 AppListModelObserverBridge::AppListModelObserverBridge( 98 AppListModelObserverBridge::AppListModelObserverBridge(
99 AppListViewController* parent) 99 AppListViewController* parent)
100 : parent_(parent) { 100 : parent_(parent) {
101 [parent_ delegate]->AddObserver(this); 101 [parent_ delegate]->AddObserver(this);
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 363
364 - (void)redoSearch { 364 - (void)redoSearch {
365 [self modelTextDidChange]; 365 [self modelTextDidChange];
366 } 366 }
367 367
368 - (void)onProfilesChanged { 368 - (void)onProfilesChanged {
369 [appsSearchBoxController_ rebuildMenu]; 369 [appsSearchBoxController_ rebuildMenu];
370 } 370 }
371 371
372 @end 372 @end
OLDNEW
« no previous file with comments | « ui/app_list/app_list_model_unittest.cc ('k') | ui/app_list/cocoa/app_list_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698