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

Side by Side Diff: ui/base/material_design/material_design_controller.h

Issue 1926943002: Introduce new flag to control usage of MD in secondary (not top-chrome) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: new fn name Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 5 #ifndef UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
6 #define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 6 #define UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/base/ui_base_export.h" 9 #include "ui/base/ui_base_export.h"
10 10
(...skipping 19 matching lines...) Expand all
30 30
31 // Initializes |mode_|. Must be called before checking |mode_|. 31 // Initializes |mode_|. Must be called before checking |mode_|.
32 static void Initialize(); 32 static void Initialize();
33 33
34 // Get the current Mode that should be used by the system. 34 // Get the current Mode that should be used by the system.
35 static Mode GetMode(); 35 static Mode GetMode();
36 36
37 // Returns true if the current mode is a material design variant. 37 // Returns true if the current mode is a material design variant.
38 static bool IsModeMaterial(); 38 static bool IsModeMaterial();
39 39
40 // Returns true if the current mode is a material design variant and this mode
41 // should be extended to cover secondary UI.
42 static bool IsSecondaryUiMaterial();
43
40 // Returns the per-platform default material design variant. 44 // Returns the per-platform default material design variant.
41 static Mode DefaultMode(); 45 static Mode DefaultMode();
42 46
43 private: 47 private:
44 friend class test::MaterialDesignControllerTestAPI; 48 friend class test::MaterialDesignControllerTestAPI;
45 49
46 // Tracks whether |mode_| has been initialized. This is necessary so tests can 50 // Tracks whether |mode_| has been initialized. This is necessary so tests can
47 // reset the state back to a clean state during tear down. 51 // reset the state back to a clean state during tear down.
48 static bool is_mode_initialized_; 52 static bool is_mode_initialized_;
49 53
50 // The current Mode to be used by the system. 54 // The current Mode to be used by the system.
51 static Mode mode_; 55 static Mode mode_;
52 56
57 // True when |mode_| applies beyond the primary UI (toolbar, tabstrip,
58 // etc.). For example, this controls use of MD inside bubbles and dialogs.
59 static bool include_secondary_ui_;
60
53 // Declarations only. Do not allow construction of an object. 61 // Declarations only. Do not allow construction of an object.
54 MaterialDesignController(); 62 MaterialDesignController();
55 ~MaterialDesignController(); 63 ~MaterialDesignController();
56 64
57 // Resets the initialization state to uninitialized. To be used by tests to 65 // Resets the initialization state to uninitialized. To be used by tests to
58 // allow calling Initialize() more than once. 66 // allow calling Initialize() more than once.
59 static void Uninitialize(); 67 static void Uninitialize();
60 68
61 // Set |mode_| to |mode| and updates |is_mode_initialized_| to true. Can be 69 // Set |mode_| to |mode| and updates |is_mode_initialized_| to true. Can be
62 // used by tests to directly set the mode. 70 // used by tests to directly set the mode.
63 static void SetMode(Mode mode); 71 static void SetMode(Mode mode);
64 72
65 DISALLOW_COPY_AND_ASSIGN(MaterialDesignController); 73 DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
66 }; 74 };
67 75
68 } // namespace ui 76 } // namespace ui
69 77
70 #endif // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 78 #endif // UI_BASE_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/download/download_item_view_md.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