OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "views/controls/menu/native_menu_x.h" | 5 #include "views/controls/menu/native_menu_x.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "gfx/canvas_skia.h" | 9 #include "gfx/canvas_skia.h" |
10 #include "gfx/skia_util.h" | 10 #include "gfx/skia_util.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 | 149 |
150 if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) { | 150 if (model->GetTypeAt(index) == ui::MenuModel::TYPE_SUBMENU) { |
151 DCHECK(mitem->HasSubmenu()); | 151 DCHECK(mitem->HasSubmenu()); |
152 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index)); | 152 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index)); |
153 } | 153 } |
154 } | 154 } |
155 } | 155 } |
156 | 156 |
157 // MenuWrapper, public: | 157 // MenuWrapper, public: |
158 | 158 |
159 #if !defined(OS_CHROMEOS) | |
160 // static | 159 // static |
161 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 160 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
162 return new NativeMenuX(menu); | 161 return new NativeMenuX(menu); |
163 } | 162 } |
164 #endif | |
165 | 163 |
166 } // namespace views | 164 } // namespace views |
OLD | NEW |