| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 147 |
| 148 if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SUBMENU) { | 148 if (model->GetTypeAt(index) == menus::MenuModel::TYPE_SUBMENU) { |
| 149 DCHECK(mitem->HasSubmenu()); | 149 DCHECK(mitem->HasSubmenu()); |
| 150 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index)); | 150 UpdateMenuFromModel(mitem->GetSubmenu(), model->GetSubmenuModelAt(index)); |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 } | 153 } |
| 154 | 154 |
| 155 // MenuWrapper, public: | 155 // MenuWrapper, public: |
| 156 | 156 |
| 157 #if !defined(OS_CHROMEOS) |
| 157 // static | 158 // static |
| 158 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 159 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
| 159 return new NativeMenuX(menu); | 160 return new NativeMenuX(menu); |
| 160 } | 161 } |
| 162 #endif |
| 161 | 163 |
| 162 } // namespace views | 164 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 5515007:
Fix static compile with touchui on chromeos. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src