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

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

Issue 1720273002: Set material hybrid by default on ChromeOS touch devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iterate over /dev/input/event* if device scan is incomplete Created 4 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: 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 9ef61c0c4e546250afeb927a3f1c9a4c39c5673c..2bc3915750fc6ef1b58a82647783157804cb6c86 100644
--- a/ui/base/material_design/material_design_controller.h
+++ b/ui/base/material_design/material_design_controller.h
@@ -34,9 +34,6 @@ class UI_BASE_EXPORT MaterialDesignController {
// Returns true if the current mode is a material design variant.
static bool IsModeMaterial();
- // Returns the per-platform default material design variant.
- static Mode DefaultMode();
-
private:
friend class test::MaterialDesignControllerTestAPI;
@@ -62,6 +59,11 @@ class UI_BASE_EXPORT MaterialDesignController {
// used by tests to directly set the mode.
static void SetMode(Mode mode);
+ // Returns the per-platform default material design variant.
+ static Mode DefaultMode();
+
+ static bool UseMaterialOrMaterialHybridByDefault();
+
DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
};

Powered by Google App Engine
This is Rietveld 408576698