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

Side by Side Diff: chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc

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 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 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" 5 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/extensions/test_extension_service.h" 10 #include "chrome/browser/extensions/test_extension_service.h"
11 #include "chrome/browser/extensions/test_extension_system.h" 11 #include "chrome/browser/extensions/test_extension_system.h"
12 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" 12 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/test/base/browser_with_test_window_test.h" 17 #include "chrome/test/base/browser_with_test_window_test.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "ui/events/event_constants.h" 19 #include "ui/events/event_constants.h"
20 #include "ui/gfx/range/range.h" 20 #include "ui/gfx/range/range.h"
21 21
22 class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest { 22 class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
23 public: 23 public:
24 BookmarkBubbleSignInDelegateTest() {} 24 BookmarkBubbleSignInDelegateTest() {}
25 25
26 virtual void SetUp() OVERRIDE; 26 virtual void SetUp() override;
27 27
28 protected: 28 protected:
29 class Window : public TestBrowserWindow { 29 class Window : public TestBrowserWindow {
30 public: 30 public:
31 Window() : show_count_(0) {} 31 Window() : show_count_(0) {}
32 32
33 int show_count() { return show_count_; } 33 int show_count() { return show_count_; }
34 34
35 private: 35 private:
36 // TestBrowserWindow: 36 // TestBrowserWindow:
37 virtual void Show() OVERRIDE { 37 virtual void Show() override {
38 ++show_count_; 38 ++show_count_;
39 } 39 }
40 40
41 // Number of times that the Show() method has been called. 41 // Number of times that the Show() method has been called.
42 int show_count_; 42 int show_count_;
43 43
44 DISALLOW_COPY_AND_ASSIGN(Window); 44 DISALLOW_COPY_AND_ASSIGN(Window);
45 }; 45 };
46 46
47 virtual BrowserWindow* CreateBrowserWindow() OVERRIDE { 47 virtual BrowserWindow* CreateBrowserWindow() override {
48 return new Window(); 48 return new Window();
49 } 49 }
50 50
51 private: 51 private:
52 DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegateTest); 52 DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleSignInDelegateTest);
53 }; 53 };
54 54
55 void BookmarkBubbleSignInDelegateTest::SetUp() { 55 void BookmarkBubbleSignInDelegateTest::SetUp() {
56 BrowserWithTestWindowTest::SetUp(); 56 BrowserWithTestWindowTest::SetUp();
57 CommandLine* command_line = CommandLine::ForCurrentProcess(); 57 CommandLine* command_line = CommandLine::ForCurrentProcess();
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // visible. 144 // visible.
145 int tab_count = extra_browser->tab_strip_model()->count(); 145 int tab_count = extra_browser->tab_strip_model()->count();
146 EXPECT_EQ(starting_tab_count + 1, tab_count); 146 EXPECT_EQ(starting_tab_count + 1, tab_count);
147 EXPECT_LE(1, 147 EXPECT_LE(1,
148 static_cast<BookmarkBubbleSignInDelegateTest::Window*>( 148 static_cast<BookmarkBubbleSignInDelegateTest::Window*>(
149 extra_window.get())->show_count()); 149 extra_window.get())->show_count());
150 150
151 // Required to avoid a crash when the browser is deleted. 151 // Required to avoid a crash when the browser is deleted.
152 extra_browser->tab_strip_model()->CloseAllTabs(); 152 extra_browser->tab_strip_model()->CloseAllTabs();
153 } 153 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698