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

Side by Side Diff: ash/material_design/material_design_controller.h

Issue 1932433002: Update activity indicator from a light bar to a point (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve compilation errors 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
« no previous file with comments | « no previous file | ash/material_design/material_design_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 5 #ifndef ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
6 #define ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 6 #define ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
(...skipping 23 matching lines...) Expand all
34 34
35 // Returns true if Material Design is enabled in Chrome OS system UI. 35 // Returns true if Material Design is enabled in Chrome OS system UI.
36 // Maps to "ash-md" flag "enabled" or "experimental" values. 36 // Maps to "ash-md" flag "enabled" or "experimental" values.
37 static bool IsMaterial(); 37 static bool IsMaterial();
38 38
39 // Returns true if Material Design experimental features are enabled in 39 // Returns true if Material Design experimental features are enabled in
40 // Chrome OS system UI. 40 // Chrome OS system UI.
41 // Maps to "--ash-md=experimental" command line switch value. 41 // Maps to "--ash-md=experimental" command line switch value.
42 static bool IsMaterialExperimental(); 42 static bool IsMaterialExperimental();
43 43
44 // Returns true if Material Design features are enabled for Chrome OS shelf.
45 static bool IsShelfMaterial();
46
44 private: 47 private:
45 friend class test::MaterialDesignControllerTestAPI; 48 friend class test::MaterialDesignControllerTestAPI;
46 49
47 // Declarations only. Do not allow construction of an object. 50 // Declarations only. Do not allow construction of an object.
48 MaterialDesignController(); 51 MaterialDesignController();
49 ~MaterialDesignController(); 52 ~MaterialDesignController();
50 53
51 // Material Design |Mode| for Chrome OS system UI. Used by tests. 54 // Material Design |Mode| for Chrome OS system UI. Used by tests.
52 static Mode mode(); 55 static Mode mode();
53 56
54 // Returns the per-platform default material design variant. 57 // Returns the per-platform default material design variant.
55 static Mode DefaultMode(); 58 static Mode DefaultMode();
56 59
57 // Sets |mode_| to |mode|. Can be used by tests to directly set the mode. 60 // Sets |mode_| to |mode|. Can be used by tests to directly set the mode.
58 static void SetMode(Mode mode); 61 static void SetMode(Mode mode);
59 62
60 // Resets the initialization state to uninitialized. To be used by tests to 63 // Resets the initialization state to uninitialized. To be used by tests to
61 // allow calling Initialize() more than once. 64 // allow calling Initialize() more than once.
62 static void Uninitialize(); 65 static void Uninitialize();
63 66
64 DISALLOW_COPY_AND_ASSIGN(MaterialDesignController); 67 DISALLOW_COPY_AND_ASSIGN(MaterialDesignController);
65 }; 68 };
66 69
67 } // namespace ash 70 } // namespace ash
68 71
69 #endif // ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_ 72 #endif // ASH_MATERIAL_DESIGN_MATERIAL_DESIGN_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/material_design/material_design_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698