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

Side by Side Diff: chrome/browser/ui/cocoa/global_error_bubble_controller.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 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/scoped_nsobject.h" 8 #include "base/mac/scoped_nsobject.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 20 matching lines...) Expand all
31 31
32 namespace GlobalErrorBubbleControllerInternal { 32 namespace GlobalErrorBubbleControllerInternal {
33 33
34 // This is the bridge to the C++ GlobalErrorBubbleViewBase object. 34 // This is the bridge to the C++ GlobalErrorBubbleViewBase object.
35 class Bridge : public GlobalErrorBubbleViewBase { 35 class Bridge : public GlobalErrorBubbleViewBase {
36 public: 36 public:
37 Bridge(GlobalErrorBubbleController* controller) : controller_(controller) { 37 Bridge(GlobalErrorBubbleController* controller) : controller_(controller) {
38 } 38 }
39 39
40 private: 40 private:
41 virtual void CloseBubbleView() override { 41 void CloseBubbleView() override { [controller_ close]; }
42 [controller_ close];
43 }
44 42
45 GlobalErrorBubbleController* controller_; // Weak, owns this. 43 GlobalErrorBubbleController* controller_; // Weak, owns this.
46 }; 44 };
47 45
48 } // namespace GlobalErrorBubbleControllerInternal 46 } // namespace GlobalErrorBubbleControllerInternal
49 47
50 @implementation GlobalErrorBubbleController 48 @implementation GlobalErrorBubbleController
51 49
52 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser 50 + (GlobalErrorBubbleViewBase*)showForBrowser:(Browser*)browser
53 error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error { 51 error:(const base::WeakPtr<GlobalErrorWithStandardBubble>&)error {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 [self close]; 153 [self close];
156 } 154 }
157 155
158 @end 156 @end
159 157
160 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView( 158 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
161 Browser* browser, 159 Browser* browser,
162 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) { 160 const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
163 return [GlobalErrorBubbleController showForBrowser:browser error:error]; 161 return [GlobalErrorBubbleController showForBrowser:browser error:error];
164 } 162 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698