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

Side by Side Diff: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h" 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 // Responsible for removing a root from the ViewManager when that view is 74 // Responsible for removing a root from the ViewManager when that view is
75 // destroyed. 75 // destroyed.
76 class RootObserver : public ViewObserver { 76 class RootObserver : public ViewObserver {
77 public: 77 public:
78 explicit RootObserver(View* root) : root_(root) {} 78 explicit RootObserver(View* root) : root_(root) {}
79 virtual ~RootObserver() {} 79 virtual ~RootObserver() {}
80 80
81 private: 81 private:
82 // Overridden from ViewObserver: 82 // Overridden from ViewObserver:
83 virtual void OnViewDestroyed(View* view) OVERRIDE { 83 virtual void OnViewDestroyed(View* view) override {
84 DCHECK_EQ(view, root_); 84 DCHECK_EQ(view, root_);
85 static_cast<ViewManagerClientImpl*>( 85 static_cast<ViewManagerClientImpl*>(
86 ViewPrivate(root_).view_manager())->RemoveRoot(root_); 86 ViewPrivate(root_).view_manager())->RemoveRoot(root_);
87 view->RemoveObserver(this); 87 view->RemoveObserver(this);
88 delete this; 88 delete this;
89 } 89 }
90 90
91 View* root_; 91 View* root_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(RootObserver); 93 DISALLOW_COPY_AND_ASSIGN(RootObserver);
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 base::Unretained(this)); 419 base::Unretained(this));
420 } 420 }
421 421
422 base::Callback<void(ErrorCode)> 422 base::Callback<void(ErrorCode)>
423 ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() { 423 ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
424 return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode, 424 return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
425 base::Unretained(this)); 425 base::Unretained(this));
426 } 426 }
427 427
428 } // namespace mojo 428 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698