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

Side by Side Diff: chrome/test/base/in_process_browser_test.cc

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (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 #include "chrome/test/base/in_process_browser_test.h" 5 #include "chrome/test/base/in_process_browser_test.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // A BrowserListObserver that makes sure that all browsers created are on the 82 // A BrowserListObserver that makes sure that all browsers created are on the
83 // |allowed_desktop_|. 83 // |allowed_desktop_|.
84 class SingleDesktopTestObserver : public chrome::BrowserListObserver, 84 class SingleDesktopTestObserver : public chrome::BrowserListObserver,
85 public base::NonThreadSafe { 85 public base::NonThreadSafe {
86 public: 86 public:
87 explicit SingleDesktopTestObserver(chrome::HostDesktopType allowed_desktop); 87 explicit SingleDesktopTestObserver(chrome::HostDesktopType allowed_desktop);
88 virtual ~SingleDesktopTestObserver(); 88 virtual ~SingleDesktopTestObserver();
89 89
90 // chrome::BrowserListObserver: 90 // chrome::BrowserListObserver:
91 virtual void OnBrowserAdded(Browser* browser) OVERRIDE; 91 virtual void OnBrowserAdded(Browser* browser) override;
92 92
93 private: 93 private:
94 chrome::HostDesktopType allowed_desktop_; 94 chrome::HostDesktopType allowed_desktop_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(SingleDesktopTestObserver); 96 DISALLOW_COPY_AND_ASSIGN(SingleDesktopTestObserver);
97 }; 97 };
98 98
99 SingleDesktopTestObserver::SingleDesktopTestObserver( 99 SingleDesktopTestObserver::SingleDesktopTestObserver(
100 chrome::HostDesktopType allowed_desktop) 100 chrome::HostDesktopType allowed_desktop)
101 : allowed_desktop_(allowed_desktop) { 101 : allowed_desktop_(allowed_desktop) {
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 // On the Mac, this eventually reaches 479 // On the Mac, this eventually reaches
480 // -[BrowserWindowController windowWillClose:], which will post a deferred 480 // -[BrowserWindowController windowWillClose:], which will post a deferred
481 // -autorelease on itself to ultimately destroy the Browser object. The line 481 // -autorelease on itself to ultimately destroy the Browser object. The line
482 // below is necessary to pump these pending messages to ensure all Browsers 482 // below is necessary to pump these pending messages to ensure all Browsers
483 // get deleted. 483 // get deleted.
484 content::RunAllPendingInMessageLoop(); 484 content::RunAllPendingInMessageLoop();
485 delete autorelease_pool_; 485 delete autorelease_pool_;
486 autorelease_pool_ = NULL; 486 autorelease_pool_ = NULL;
487 #endif 487 #endif
488 } 488 }
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.h ('k') | chrome/test/base/in_process_browser_test_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698