| 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_gtk.h" | 5 #include "views/controls/menu/native_menu_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 NativeMenuGtk* native_menu = | 548 NativeMenuGtk* native_menu = |
| 549 static_cast<NativeMenuGtk*>(menu2->wrapper_.get()); | 549 static_cast<NativeMenuGtk*>(menu2->wrapper_.get()); |
| 550 // The native gtk widget has already been destroyed. | 550 // The native gtk widget has already been destroyed. |
| 551 native_menu->menu_ = NULL; | 551 native_menu->menu_ = NULL; |
| 552 delete menu2; | 552 delete menu2; |
| 553 } | 553 } |
| 554 | 554 |
| 555 //////////////////////////////////////////////////////////////////////////////// | 555 //////////////////////////////////////////////////////////////////////////////// |
| 556 // MenuWrapper, public: | 556 // MenuWrapper, public: |
| 557 | 557 |
| 558 #if !defined(OS_CHROMEOS) | |
| 559 | |
| 560 // static | 558 // static |
| 561 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { | 559 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) { |
| 562 return new NativeMenuGtk(menu); | 560 return new NativeMenuGtk(menu); |
| 563 } | 561 } |
| 564 | 562 |
| 565 #endif // OS_CHROMEOS | |
| 566 | |
| 567 } // namespace views | 563 } // namespace views |
| OLD | NEW |