| OLD | NEW |
| 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/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 ash::Shell::DeleteInstance(); | 79 ash::Shell::DeleteInstance(); |
| 80 env_.reset(); | 80 env_.reset(); |
| 81 | 81 |
| 82 chromeos::NetworkHandler::Shutdown(); | 82 chromeos::NetworkHandler::Shutdown(); |
| 83 chromeos::CrasAudioHandler::Shutdown(); | 83 chromeos::CrasAudioHandler::Shutdown(); |
| 84 bluez::BluezDBusManager::Shutdown(); | 84 bluez::BluezDBusManager::Shutdown(); |
| 85 chromeos::DBusThreadManager::Shutdown(); | 85 chromeos::DBusThreadManager::Shutdown(); |
| 86 // Ash Shell can't just live on its own without a browser process, we need to | 86 // Ash Shell can't just live on its own without a browser process, we need to |
| 87 // also shut down the message center. | 87 // also shut down the message center. |
| 88 message_center::MessageCenter::Shutdown(); | 88 message_center::MessageCenter::Shutdown(); |
| 89 ash::MaterialDesignController::Uninitialize(); |
| 89 } | 90 } |
| 90 | 91 |
| 91 } // namespace | 92 } // namespace |
| 92 | 93 |
| 93 // static | 94 // static |
| 94 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( | 95 ViewEventTestPlatformPart* ViewEventTestPlatformPart::Create( |
| 95 ui::ContextFactory* context_factory) { | 96 ui::ContextFactory* context_factory) { |
| 96 return new ViewEventTestPlatformPartChromeOS(context_factory); | 97 return new ViewEventTestPlatformPartChromeOS(context_factory); |
| 97 } | 98 } |
| OLD | NEW |