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

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

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: yet another rebase 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"
8 #include "base/location.h" 7 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 9 #include "base/run_loop.h"
11 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
12 #include "base/threading/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
13 #include "build/build_config.h" 12 #include "build/build_config.h"
14 #include "chrome/browser/profiles/profile_destroyer.h" 13 #include "chrome/browser/profiles/profile_destroyer.h"
15 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_navigator.h" 15 #include "chrome/browser/ui/browser_navigator.h"
17 #include "chrome/browser/ui/browser_navigator_params.h" 16 #include "chrome/browser/ui/browser_navigator_params.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 53
55 void BrowserWithTestWindowTest::SetUp() { 54 void BrowserWithTestWindowTest::SetUp() {
56 testing::Test::SetUp(); 55 testing::Test::SetUp();
57 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
58 // TODO(jamescook): Windows Ash support. This will require refactoring 57 // TODO(jamescook): Windows Ash support. This will require refactoring
59 // AshTestHelper and AuraTestHelper so they can be used at the same time, 58 // AshTestHelper and AuraTestHelper so they can be used at the same time,
60 // perhaps by AshTestHelper owning an AuraTestHelper. 59 // perhaps by AshTestHelper owning an AuraTestHelper.
61 ash_test_environment_ = base::MakeUnique<AshTestEnvironmentChrome>(); 60 ash_test_environment_ = base::MakeUnique<AshTestEnvironmentChrome>();
62 ash_test_helper_.reset( 61 ash_test_helper_.reset(
63 new ash::test::AshTestHelper(ash_test_environment_.get())); 62 new ash::test::AshTestHelper(ash_test_environment_.get()));
64 ash_test_helper_->SetUp(true, 63 ash_test_helper_->SetUp(true);
65 ash::MaterialDesignController::Mode::UNINITIALIZED);
66 #elif defined(TOOLKIT_VIEWS) 64 #elif defined(TOOLKIT_VIEWS)
67 views_test_helper_.reset(new views::ScopedViewsTestHelper()); 65 views_test_helper_.reset(new views::ScopedViewsTestHelper());
68 #endif 66 #endif
69 #if defined(TOOLKIT_VIEWS) 67 #if defined(TOOLKIT_VIEWS)
70 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient()); 68 SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
71 #endif 69 #endif
72 70
73 if (content::IsBrowserSideNavigationEnabled()) 71 if (content::IsBrowserSideNavigationEnabled())
74 content::BrowserSideNavigationSetUp(); 72 content::BrowserSideNavigationSetUp();
75 73
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 Browser::CreateParams params(profile); 201 Browser::CreateParams params(profile);
204 if (hosted_app) { 202 if (hosted_app) {
205 params = Browser::CreateParams::CreateForApp( 203 params = Browser::CreateParams::CreateForApp(
206 "Test", true /* trusted_source */, gfx::Rect(), profile); 204 "Test", true /* trusted_source */, gfx::Rect(), profile);
207 } else { 205 } else {
208 params.type = browser_type; 206 params.type = browser_type;
209 } 207 }
210 params.window = browser_window; 208 params.window = browser_window;
211 return new Browser(params); 209 return new Browser(params);
212 } 210 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/test/base/view_event_test_platform_part_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698