| 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 fb58f0bf25a4b9dd984442e8f7ae77a87aa11cea..d421d50661f90d76608b5931778ce6299c052589 100644
|
| --- a/ui/base/material_design/material_design_controller.h
|
| +++ b/ui/base/material_design/material_design_controller.h
|
| @@ -31,6 +31,8 @@ class UI_BASE_EXPORT MaterialDesignController {
|
| // Initializes |mode_|. Must be called before checking |mode_|.
|
| static void Initialize();
|
|
|
| + static bool DeviceListsComplete();
|
| +
|
| // Get the current Mode that should be used by the system.
|
| static Mode GetMode();
|
|
|
| @@ -47,6 +49,9 @@ class UI_BASE_EXPORT MaterialDesignController {
|
| // reset the state back to a clean state during tear down.
|
| static bool is_mode_initialized_;
|
|
|
| + // Terry: merge with above.
|
| + static bool mode_initialized_by_switch_;
|
| +
|
| // The current Mode to be used by the system.
|
| static Mode mode_;
|
|
|
|
|