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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1878943002: Revert of Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « chrome/app/resources/resources_unittest.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 5d2193670a709d73fc072f18e20f04a6839e3788..1fe82adcde3ebbda95389e0ecfc1eb8aee299ac4 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -156,7 +156,6 @@
#include "net/url_request/url_request.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/layout.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/strings/grit/app_locale_settings.h"
@@ -969,14 +968,12 @@
flags_ui::kAddSentinels);
}
#endif // !defined(OS_CHROMEOS)
+
+#if defined(OS_MACOSX)
// The MaterialDesignController needs to look at command line flags, which
// are not available until this point. Now that they are, proceed with
- // initializing the MaterialDesignController.
- ui::MaterialDesignController::Initialize();
-
-#if defined(OS_MACOSX)
- // Material Design resource packs can be loaded now that command line flags
- // are set. See https://crbug.com/585290 .
+ // (conditionally) loading the Material Design resource packs. See
+ // https://crbug.com/585290 .
ui::ResourceBundle::GetSharedInstance().LoadMaterialDesignResources();
#endif
« no previous file with comments | « chrome/app/resources/resources_unittest.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698