OLD | NEW |
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 "base/location.h" | 7 #include "base/location.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 BrowserWindow* BrowserWithTestWindowTest::CreateBrowserWindow() { | 225 BrowserWindow* BrowserWithTestWindowTest::CreateBrowserWindow() { |
226 return new TestBrowserWindow(); | 226 return new TestBrowserWindow(); |
227 } | 227 } |
228 | 228 |
229 Browser* BrowserWithTestWindowTest::CreateBrowser( | 229 Browser* BrowserWithTestWindowTest::CreateBrowser( |
230 Profile* profile, | 230 Profile* profile, |
231 Browser::Type browser_type, | 231 Browser::Type browser_type, |
232 bool hosted_app, | 232 bool hosted_app, |
233 chrome::HostDesktopType host_desktop_type, | 233 chrome::HostDesktopType host_desktop_type, |
234 BrowserWindow* browser_window) { | 234 BrowserWindow* browser_window) { |
235 Browser::CreateParams params(profile, host_desktop_type); | 235 Browser::CreateParams params(profile); |
236 if (hosted_app) { | 236 if (hosted_app) { |
237 params = Browser::CreateParams::CreateForApp("Test", | 237 params = Browser::CreateParams::CreateForApp( |
238 true /* trusted_source */, | 238 "Test", true /* trusted_source */, gfx::Rect(), profile); |
239 gfx::Rect(), | |
240 profile, | |
241 host_desktop_type); | |
242 } else { | 239 } else { |
243 params.type = browser_type; | 240 params.type = browser_type; |
244 } | 241 } |
245 params.window = browser_window; | 242 params.window = browser_window; |
246 return new Browser(params); | 243 return new Browser(params); |
247 } | 244 } |
OLD | NEW |