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

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

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments & Refactor border around item implementation Created 4 years, 6 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 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/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/material_design/material_design_controller.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 #include "ash/shell_init_params.h" 12 #include "ash/shell_init_params.h"
12 #include "ash/test/ash_test_helper.h" 13 #include "ash/test/ash_test_helper.h"
13 #include "ash/test/test_session_state_delegate.h" 14 #include "ash/test/test_session_state_delegate.h"
14 #include "ash/test/test_shell_delegate.h" 15 #include "ash/test/test_shell_delegate.h"
15 #include "base/command_line.h" 16 #include "base/command_line.h"
16 #include "base/macros.h" 17 #include "base/macros.h"
17 #include "chromeos/audio/cras_audio_handler.h" 18 #include "chromeos/audio/cras_audio_handler.h"
18 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
19 #include "chromeos/network/network_handler.h" 20 #include "chromeos/network/network_handler.h"
(...skipping 30 matching lines...) Expand all
50 // Ash Shell can't just live on its own without a browser process, we need to 51 // Ash Shell can't just live on its own without a browser process, we need to
51 // also create the message center. 52 // also create the message center.
52 message_center::MessageCenter::Initialize(); 53 message_center::MessageCenter::Initialize();
53 chromeos::DBusThreadManager::Initialize(); 54 chromeos::DBusThreadManager::Initialize();
54 bluez::BluezDBusManager::Initialize( 55 bluez::BluezDBusManager::Initialize(
55 chromeos::DBusThreadManager::Get()->GetSystemBus(), 56 chromeos::DBusThreadManager::Get()->GetSystemBus(),
56 chromeos::DBusThreadManager::Get()->IsUsingStub( 57 chromeos::DBusThreadManager::Get()->IsUsingStub(
57 chromeos::DBusClientBundle::BLUETOOTH)); 58 chromeos::DBusClientBundle::BLUETOOTH));
58 chromeos::CrasAudioHandler::InitializeForTesting(); 59 chromeos::CrasAudioHandler::InitializeForTesting();
59 chromeos::NetworkHandler::Initialize(); 60 chromeos::NetworkHandler::Initialize();
61 ash::MaterialDesignController::Initialize();
bruthig 2016/06/03 20:18:17 Don't forget to Uninitialize() in tear down.
yiyix 2016/06/10 19:26:05 Done.
60 62
61 env_ = aura::Env::CreateInstance(); 63 env_ = aura::Env::CreateInstance();
62 ash::test::TestShellDelegate* shell_delegate = 64 ash::test::TestShellDelegate* shell_delegate =
63 new ash::test::TestShellDelegate(); 65 new ash::test::TestShellDelegate();
64 ash::ShellInitParams init_params; 66 ash::ShellInitParams init_params;
65 init_params.delegate = shell_delegate; 67 init_params.delegate = shell_delegate;
66 init_params.context_factory = context_factory; 68 init_params.context_factory = context_factory;
67 init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); 69 init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
68 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( 70 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
69 ash::switches::kAshHostWindowBounds, "0+0-1280x800"); 71 ash::switches::kAshHostWindowBounds, "0+0-1280x800");
(...skipping 16 matching lines...) Expand all
86 message_center::MessageCenter::Shutdown(); 88 message_center::MessageCenter::Shutdown();
87 } 89 }
88 90
89 } // namespace 91 } // namespace
90 92
91 // static 93 // static
92 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( 94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create(
93 ui::ContextFactory* context_factory) { 95 ui::ContextFactory* context_factory) {
94 return new ViewEventTestPlatformPartChromeOS(context_factory); 96 return new ViewEventTestPlatformPartChromeOS(context_factory);
95 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698