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

Side by Side Diff: chrome/test/base/view_event_test_platform_part_chromeos.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
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/view_event_test_platform_part.h" 5 #include "chrome/test/base/view_event_test_platform_part.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/test/test_session_state_delegate.h" 9 #include "ash/common/test/test_session_state_delegate.h"
11 #include "ash/shell.h" 10 #include "ash/shell.h"
12 #include "ash/shell_init_params.h" 11 #include "ash/shell_init_params.h"
13 #include "ash/test/ash_test_helper.h" 12 #include "ash/test/ash_test_helper.h"
14 #include "ash/test/test_shell_delegate.h" 13 #include "ash/test/test_shell_delegate.h"
15 #include "base/command_line.h" 14 #include "base/command_line.h"
16 #include "base/macros.h" 15 #include "base/macros.h"
17 #include "chromeos/audio/cras_audio_handler.h" 16 #include "chromeos/audio/cras_audio_handler.h"
18 #include "chromeos/dbus/dbus_thread_manager.h" 17 #include "chromeos/dbus/dbus_thread_manager.h"
19 #include "chromeos/network/network_handler.h" 18 #include "chromeos/network/network_handler.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 ui::ContextFactoryPrivate* context_factory_private) { 51 ui::ContextFactoryPrivate* context_factory_private) {
53 // Ash Shell can't just live on its own without a browser process, we need to 52 // Ash Shell can't just live on its own without a browser process, we need to
54 // also create the message center. 53 // also create the message center.
55 message_center::MessageCenter::Initialize(); 54 message_center::MessageCenter::Initialize();
56 chromeos::DBusThreadManager::Initialize(); 55 chromeos::DBusThreadManager::Initialize();
57 bluez::BluezDBusManager::Initialize( 56 bluez::BluezDBusManager::Initialize(
58 chromeos::DBusThreadManager::Get()->GetSystemBus(), 57 chromeos::DBusThreadManager::Get()->GetSystemBus(),
59 chromeos::DBusThreadManager::Get()->IsUsingFakes()); 58 chromeos::DBusThreadManager::Get()->IsUsingFakes());
60 chromeos::CrasAudioHandler::InitializeForTesting(); 59 chromeos::CrasAudioHandler::InitializeForTesting();
61 chromeos::NetworkHandler::Initialize(); 60 chromeos::NetworkHandler::Initialize();
62 ash::MaterialDesignController::Initialize();
63 61
64 env_ = aura::Env::CreateInstance(); 62 env_ = aura::Env::CreateInstance();
65 ash::test::TestShellDelegate* shell_delegate = 63 ash::test::TestShellDelegate* shell_delegate =
66 new ash::test::TestShellDelegate(); 64 new ash::test::TestShellDelegate();
67 ash::ShellInitParams init_params; 65 ash::ShellInitParams init_params;
68 init_params.delegate = shell_delegate; 66 init_params.delegate = shell_delegate;
69 init_params.context_factory = context_factory; 67 init_params.context_factory = context_factory;
70 init_params.context_factory_private = context_factory_private; 68 init_params.context_factory_private = context_factory_private;
71 init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); 69 init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
72 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( 70 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
(...skipping 19 matching lines...) Expand all
92 90
93 } // namespace 91 } // namespace
94 92
95 // static 93 // static
96 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( 94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
97 ui::ContextFactory* context_factory, 95 ui::ContextFactory* context_factory,
98 ui::ContextFactoryPrivate* context_factory_private) { 96 ui::ContextFactoryPrivate* context_factory_private) {
99 return new ViewEventTestPlatformPartChromeOS(context_factory, 97 return new ViewEventTestPlatformPartChromeOS(context_factory,
100 context_factory_private); 98 context_factory_private);
101 } 99 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698