Chromium Code Reviews Chromium Code Reviews
Issue 10270021:
Make all the menu UI consitent with the new chromeos menu spec. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "ui/views/controls/menu/menu_config.h" | 5 #include "ui/views/controls/menu/menu_config.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "ui/base/ui_base_switches.h" | 9 #include "ui/base/ui_base_switches.h" |
| 10 | 10 |
| 11 namespace views { | 11 namespace views { |
| 12 | 12 |
| 13 static MenuConfig* config_instance = NULL; | 13 static MenuConfig* config_instance = NULL; |
| 14 | 14 |
| 15 MenuConfig::MenuConfig() | 15 MenuConfig::MenuConfig() |
| 16 : text_color(SK_ColorBLACK), | 16 : item_top_margin(3), |
|
sky
2012/04/30 21:29:59
Leave this so that it's always initialized. Win/Vi
jennyz
2012/04/30 21:37:56
Done.
| |
| 17 item_top_margin(3), | |
| 18 item_bottom_margin(4), | 17 item_bottom_margin(4), |
| 19 item_no_icon_top_margin(1), | 18 item_no_icon_top_margin(1), |
| 20 item_no_icon_bottom_margin(3), | 19 item_no_icon_bottom_margin(3), |
| 21 item_left_margin(4), | 20 item_left_margin(4), |
| 22 label_to_arrow_padding(10), | 21 label_to_arrow_padding(10), |
| 23 arrow_to_edge_padding(5), | 22 arrow_to_edge_padding(5), |
| 24 icon_to_label_padding(8), | 23 icon_to_label_padding(8), |
| 25 gutter_to_label(5), | 24 gutter_to_label(5), |
| 26 check_width(16), | 25 check_width(16), |
| 27 check_height(16), | 26 check_height(16), |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 52 } | 51 } |
| 53 | 52 |
| 54 // static | 53 // static |
| 55 const MenuConfig& MenuConfig::instance() { | 54 const MenuConfig& MenuConfig::instance() { |
| 56 if (!config_instance) | 55 if (!config_instance) |
| 57 config_instance = Create(); | 56 config_instance = Create(); |
| 58 return *config_instance; | 57 return *config_instance; |
| 59 } | 58 } |
| 60 | 59 |
| 61 } // namespace views | 60 } // namespace views |
| OLD | NEW |
