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

Side by Side Diff: chrome/test/base/browser_with_test_window_test.h

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
« no previous file with comments | « chrome/test/base/browser_tests_main.cc ('k') | chrome/test/base/chrome_process_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 BrowserWithTestWindowTest(); 83 BrowserWithTestWindowTest();
84 84
85 // Creates a BrowserWithTestWindowTest for which the initial window will be 85 // Creates a BrowserWithTestWindowTest for which the initial window will be
86 // the specified type. 86 // the specified type.
87 BrowserWithTestWindowTest(Browser::Type browser_type, 87 BrowserWithTestWindowTest(Browser::Type browser_type,
88 chrome::HostDesktopType host_desktop_type, 88 chrome::HostDesktopType host_desktop_type,
89 bool hosted_app); 89 bool hosted_app);
90 90
91 virtual ~BrowserWithTestWindowTest(); 91 virtual ~BrowserWithTestWindowTest();
92 92
93 virtual void SetUp() OVERRIDE; 93 virtual void SetUp() override;
94 virtual void TearDown() OVERRIDE; 94 virtual void TearDown() override;
95 95
96 protected: 96 protected:
97 BrowserWindow* window() const { return window_.get(); } 97 BrowserWindow* window() const { return window_.get(); }
98 98
99 Browser* browser() const { return browser_.get(); } 99 Browser* browser() const { return browser_.get(); }
100 void set_browser(Browser* browser) { 100 void set_browser(Browser* browser) {
101 browser_.reset(browser); 101 browser_.reset(browser);
102 } 102 }
103 Browser* release_browser() WARN_UNUSED_RESULT { 103 Browser* release_browser() WARN_UNUSED_RESULT {
104 return browser_.release(); 104 return browser_.release();
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // The desktop to create the initial window on. 206 // The desktop to create the initial window on.
207 chrome::HostDesktopType host_desktop_type_; 207 chrome::HostDesktopType host_desktop_type_;
208 208
209 // Whether the browser is part of a hosted app. 209 // Whether the browser is part of a hosted app.
210 bool hosted_app_; 210 bool hosted_app_;
211 211
212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); 212 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
213 }; 213 };
214 214
215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 215 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/base/browser_tests_main.cc ('k') | chrome/test/base/chrome_process_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698