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

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 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 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_contr oller.h" 5 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_contr oller.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 13 matching lines...) Expand all
24 public: 24 public:
25 ProfileSigninConfirmationViewControllerTest() 25 ProfileSigninConfirmationViewControllerTest()
26 : window_(nil), 26 : window_(nil),
27 continued_(false), 27 continued_(false),
28 cancelled_(false), 28 cancelled_(false),
29 created_(false), 29 created_(false),
30 closed_(false) { 30 closed_(false) {
31 } 31 }
32 32
33 protected: 33 protected:
34 virtual void SetUpOnMainThread() OVERRIDE { 34 virtual void SetUpOnMainThread() override {
35 } 35 }
36 36
37 void SetupDialog(bool offerProfileCreation = true) { 37 void SetupDialog(bool offerProfileCreation = true) {
38 window_.reset( 38 window_.reset(
39 [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 600) 39 [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 600)
40 styleMask:NSBorderlessWindowMask 40 styleMask:NSBorderlessWindowMask
41 backing:NSBackingStoreBuffered 41 backing:NSBackingStoreBuffered
42 defer:NO]); 42 defer:NO]);
43 base::Closure close = base::Bind( 43 base::Closure close = base::Bind(
44 &ProfileSigninConfirmationViewControllerTest::OnClose, this); 44 &ProfileSigninConfirmationViewControllerTest::OnClose, this);
(...skipping 11 matching lines...) Expand all
56 // Test helpers. 56 // Test helpers.
57 std::string username() { 57 std::string username() {
58 return "foo@bar.com"; 58 return "foo@bar.com";
59 } 59 }
60 base::string16 learn_more() { 60 base::string16 learn_more() {
61 return l10n_util::GetStringUTF16( 61 return l10n_util::GetStringUTF16(
62 IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE); 62 IDS_ENTERPRISE_SIGNIN_PROFILE_LINK_LEARN_MORE);
63 } 63 }
64 64
65 // ui::ProfileSigninConfirmationDelegate: 65 // ui::ProfileSigninConfirmationDelegate:
66 virtual void OnContinueSignin() OVERRIDE { continued_ = true; } 66 virtual void OnContinueSignin() override { continued_ = true; }
67 virtual void OnCancelSignin() OVERRIDE { cancelled_ = true; } 67 virtual void OnCancelSignin() override { cancelled_ = true; }
68 virtual void OnSigninWithNewProfile() OVERRIDE { created_ = true; } 68 virtual void OnSigninWithNewProfile() override { created_ = true; }
69 void OnClose() { closed_ = true; } 69 void OnClose() { closed_ = true; }
70 70
71 // The window containing the dialog. 71 // The window containing the dialog.
72 base::scoped_nsobject<NSWindow> window_; 72 base::scoped_nsobject<NSWindow> window_;
73 73
74 // Dialog under test. 74 // Dialog under test.
75 base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_; 75 base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
76 76
77 // Visible for testing UI interactions. 77 // Visible for testing UI interactions.
78 bool continued_; 78 bool continued_;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 EXPECT_NSNE(nil, [controller_ createProfileButton]); 177 EXPECT_NSNE(nil, [controller_ createProfileButton]);
178 EXPECT_TRUE([[[controller_ view] subviews] 178 EXPECT_TRUE([[[controller_ view] subviews]
179 containsObject:[controller_ createProfileButton]]); 179 containsObject:[controller_ createProfileButton]]);
180 NSString* explanationWithCreateProfile = base::SysUTF16ToNSString( 180 NSString* explanationWithCreateProfile = base::SysUTF16ToNSString(
181 l10n_util::GetStringFUTF16( 181 l10n_util::GetStringFUTF16(
182 IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW_STYLE, 182 IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION_NEW_STYLE,
183 base::UTF8ToUTF16(username()), learn_more())); 183 base::UTF8ToUTF16(username()), learn_more()));
184 EXPECT_NSEQ(explanationWithCreateProfile, 184 EXPECT_NSEQ(explanationWithCreateProfile,
185 [[[controller_ explanationField] textStorage] string]); 185 [[[controller_ explanationField] textStorage] string]);
186 } 186 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698