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

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

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: We have both kinds of compile fixes: mac and windows 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 (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/browser_with_test_window_test.h" 5 #include "chrome/test/base/browser_with_test_window_test.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 BrowserWindow* BrowserWithTestWindowTest::CreateBrowserWindow() { 194 BrowserWindow* BrowserWithTestWindowTest::CreateBrowserWindow() {
195 return new TestBrowserWindow(); 195 return new TestBrowserWindow();
196 } 196 }
197 197
198 Browser* BrowserWithTestWindowTest::CreateBrowser( 198 Browser* BrowserWithTestWindowTest::CreateBrowser(
199 Profile* profile, 199 Profile* profile,
200 Browser::Type browser_type, 200 Browser::Type browser_type,
201 bool hosted_app, 201 bool hosted_app,
202 BrowserWindow* browser_window) { 202 BrowserWindow* browser_window) {
203 Browser::CreateParams params(profile); 203 Browser::CreateParams params(profile, true);
204 if (hosted_app) { 204 if (hosted_app) {
205 params = Browser::CreateParams::CreateForApp( 205 params = Browser::CreateParams::CreateForApp(
206 "Test", true /* trusted_source */, gfx::Rect(), profile); 206 "Test", true /* trusted_source */, gfx::Rect(), profile, true);
207 } else { 207 } else {
208 params.type = browser_type; 208 params.type = browser_type;
209 } 209 }
210 params.window = browser_window; 210 params.window = browser_window;
211 return new Browser(params); 211 return new Browser(params);
212 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698