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

Unified Diff: ash/mus/window_manager_application.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/test/wm_test_helper.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 099d3cb302dd37518110ba949c94a2f11e8c7d3b..0a8abdb468995afd9613923e8c098f9edf8113eb 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/mojo_interface_factory.h"
#include "ash/common/system/chromeos/power/power_status.h"
#include "ash/common/wm_shell.h"
@@ -113,8 +112,6 @@ void WindowManagerApplication::OnStart() {
views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
window_manager_.reset(new WindowManager(context()->connector()));
- MaterialDesignController::Initialize();
-
tracing_.Initialize(context()->connector(), context()->identity().name());
std::unique_ptr<aura::WindowTreeClient> window_tree_client =
« no previous file with comments | « ash/mus/test/wm_test_helper.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698