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

Unified Diff: ui/base/material_design/material_design_controller.h

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 | « ui/aura/test/aura_test_base.cc ('k') | ui/base/material_design/material_design_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/material_design/material_design_controller.h
diff --git a/ui/base/material_design/material_design_controller.h b/ui/base/material_design/material_design_controller.h
index e105044b628ce36086f7abab977598072229304d..9ef61c0c4e546250afeb927a3f1c9a4c39c5673c 100644
--- a/ui/base/material_design/material_design_controller.h
+++ b/ui/base/material_design/material_design_controller.h
@@ -28,9 +28,6 @@
MATERIAL_HYBRID = 2
};
- // Initializes |mode_|. Must be called before checking |mode_|.
- static void Initialize();
-
// Get the current Mode that should be used by the system.
static Mode GetMode();
@@ -54,6 +51,9 @@
MaterialDesignController();
~MaterialDesignController();
+ // Initializes |mode_|.
+ static void InitializeMode();
+
// Resets the Mode state to uninitialized. To be used by tests to cleanup
// global state.
static void UninitializeMode();
« no previous file with comments | « ui/aura/test/aura_test_base.cc ('k') | ui/base/material_design/material_design_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698