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

Side by Side Diff: chrome/browser/ui/browser_close_browsertest.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 (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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 enum { REGULAR = 0, INCOGNITO = 1 } window_to_probe; 70 enum { REGULAR = 0, INCOGNITO = 1 } window_to_probe;
71 71
72 // Output 72 // Output
73 Browser::DownloadClosePreventionType type; 73 Browser::DownloadClosePreventionType type;
74 74
75 // Unchecked if type == DOWNLOAD_CLOSE_OK. 75 // Unchecked if type == DOWNLOAD_CLOSE_OK.
76 int num_blocking; 76 int num_blocking;
77 }; 77 };
78 78
79 protected: 79 protected:
80 virtual void SetUpOnMainThread() OVERRIDE { 80 virtual void SetUpOnMainThread() override {
81 BrowserThread::PostTask( 81 BrowserThread::PostTask(
82 BrowserThread::IO, FROM_HERE, 82 BrowserThread::IO, FROM_HERE,
83 base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); 83 base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
84 } 84 }
85 85
86 // Create a second profile to work within multi-profile. 86 // Create a second profile to work within multi-profile.
87 Profile* CreateSecondProfile() { 87 Profile* CreateSecondProfile() {
88 base::FilePath user_data_dir; 88 base::FilePath user_data_dir;
89 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); 89 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
90 90
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 } 561 }
562 } 562 }
563 563
564 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) { 564 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
565 ASSERT_TRUE(SetupForDownloadCloseCheck()); 565 ASSERT_TRUE(SetupForDownloadCloseCheck());
566 for (size_t i = 5 * arraysize(download_close_check_cases) / 6; 566 for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
567 i < 6 * arraysize(download_close_check_cases) / 6; ++i) { 567 i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
568 ExecuteDownloadCloseCheckCase(i); 568 ExecuteDownloadCloseCheckCase(i);
569 } 569 }
570 } 570 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_command_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698