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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 2692663002: Gut ash::MaterialDesignController, and remove the about:flags entry. (Closed)
Patch Set: terry review 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
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 0cbbdd09e2daec2d613451a97828798195988c8a..c4a108d47a6c3a843a2f79ca77c2dca73991fc10 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -186,7 +186,6 @@
#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
-#include "ash/common/material_design/material_design_controller.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/settings/cros_settings_names.h"
@@ -1055,9 +1054,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// are not available until this point. Now that they are, proceed with
// initializing the MaterialDesignController.
ui::MaterialDesignController::Initialize();
-#if defined(OS_CHROMEOS)
- ash::MaterialDesignController::Initialize();
-#endif // !defined(OS_CHROMEOS)
#if defined(OS_WIN)
// This is needed to enable ETW exporting when requested in about:flags.

Powered by Google App Engine
This is Rietveld 408576698