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

Side by Side Diff: chrome/browser/ui/browser_close_unittest.cc

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 10 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/download/chrome_download_manager_delegate.h" 10 #include "chrome/browser/download/chrome_download_manager_delegate.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 static_cast<TestingDownloadService*>(download_service)); 149 static_cast<TestingDownloadService*>(download_service));
150 mock_download_service->SetDownloadCount(num_downloads); 150 mock_download_service->SetDownloadCount(num_downloads);
151 151
152 CHECK(browser_windows_.end() == browser_windows_.find(profile)); 152 CHECK(browser_windows_.end() == browser_windows_.find(profile));
153 CHECK(browsers_.end() == browsers_.find(profile)); 153 CHECK(browsers_.end() == browsers_.find(profile));
154 154
155 std::vector<TestBrowserWindow*> windows; 155 std::vector<TestBrowserWindow*> windows;
156 std::vector<Browser*> browsers; 156 std::vector<Browser*> browsers;
157 for (int i = 0; i < num_windows; ++i) { 157 for (int i = 0; i < num_windows; ++i) {
158 TestBrowserWindow* window = new TestBrowserWindow(); 158 TestBrowserWindow* window = new TestBrowserWindow();
159 Browser::CreateParams params(profile); 159 Browser::CreateParams params(profile, true);
160 params.type = Browser::TYPE_TABBED; 160 params.type = Browser::TYPE_TABBED;
161 params.window = window; 161 params.window = window;
162 Browser* browser = new Browser(params); 162 Browser* browser = new Browser(params);
163 163
164 windows.push_back(window); 164 windows.push_back(window);
165 browsers.push_back(browser); 165 browsers.push_back(browser);
166 } 166 }
167 167
168 browser_windows_[profile] = windows; 168 browser_windows_[profile] = windows;
169 browsers_[profile] = browsers; 169 browsers_[profile] = browsers;
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 Profile* profile = CreateProfile(1, 0); 341 Profile* profile = CreateProfile(1, 0);
342 Profile* incognito_profile = CreateIncognitoProfile(profile, 1, 2); 342 Profile* incognito_profile = CreateIncognitoProfile(profile, 1, 2);
343 343
344 Browser* browser = GetProfileBrowser(incognito_profile, 0); 344 Browser* browser = GetProfileBrowser(incognito_profile, 0);
345 345
346 int num_downloads_blocking = 0; 346 int num_downloads_blocking = 0;
347 EXPECT_EQ(Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, 347 EXPECT_EQ(Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE,
348 browser->OkToCloseWithInProgressDownloads(&num_downloads_blocking)); 348 browser->OkToCloseWithInProgressDownloads(&num_downloads_blocking));
349 EXPECT_EQ(2, num_downloads_blocking); 349 EXPECT_EQ(2, num_downloads_blocking);
350 } 350 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_command_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698