| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/rand_util.h" | 8 #include "base/rand_util.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1546 //////////////////////////////////////////////////////////////////////////////// | 1546 //////////////////////////////////////////////////////////////////////////////// |
| 1547 // Dialogs' default button | 1547 // Dialogs' default button |
| 1548 //////////////////////////////////////////////////////////////////////////////// | 1548 //////////////////////////////////////////////////////////////////////////////// |
| 1549 | 1549 |
| 1550 class MockMenuModel : public ui::MenuModel { | 1550 class MockMenuModel : public ui::MenuModel { |
| 1551 public: | 1551 public: |
| 1552 MOCK_CONST_METHOD0(HasIcons, bool()); | 1552 MOCK_CONST_METHOD0(HasIcons, bool()); |
| 1553 MOCK_CONST_METHOD1(GetFirstItemIndex, int(gfx::NativeMenu native_menu)); | 1553 MOCK_CONST_METHOD1(GetFirstItemIndex, int(gfx::NativeMenu native_menu)); |
| 1554 MOCK_CONST_METHOD0(GetItemCount, int()); | 1554 MOCK_CONST_METHOD0(GetItemCount, int()); |
| 1555 MOCK_CONST_METHOD1(GetTypeAt, ItemType(int index)); | 1555 MOCK_CONST_METHOD1(GetTypeAt, ItemType(int index)); |
| 1556 MOCK_CONST_METHOD1(GetSeparatorTypeAt, ui::MenuSeparatorType(int index)); |
| 1556 MOCK_CONST_METHOD1(GetCommandIdAt, int(int index)); | 1557 MOCK_CONST_METHOD1(GetCommandIdAt, int(int index)); |
| 1557 MOCK_CONST_METHOD1(GetLabelAt, string16(int index)); | 1558 MOCK_CONST_METHOD1(GetLabelAt, string16(int index)); |
| 1558 MOCK_CONST_METHOD1(IsItemDynamicAt, bool(int index)); | 1559 MOCK_CONST_METHOD1(IsItemDynamicAt, bool(int index)); |
| 1559 MOCK_CONST_METHOD1(GetLabelFontAt, const gfx::Font* (int index)); | 1560 MOCK_CONST_METHOD1(GetLabelFontAt, const gfx::Font* (int index)); |
| 1560 MOCK_CONST_METHOD2(GetAcceleratorAt, bool(int index, | 1561 MOCK_CONST_METHOD2(GetAcceleratorAt, bool(int index, |
| 1561 ui::Accelerator* accelerator)); | 1562 ui::Accelerator* accelerator)); |
| 1562 MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index)); | 1563 MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index)); |
| 1563 MOCK_CONST_METHOD1(GetGroupIdAt, int(int index)); | 1564 MOCK_CONST_METHOD1(GetGroupIdAt, int(int index)); |
| 1564 MOCK_METHOD2(GetIconAt, bool(int index, gfx::Image* icon)); | 1565 MOCK_METHOD2(GetIconAt, bool(int index, gfx::Image* icon)); |
| 1565 MOCK_CONST_METHOD1(GetButtonMenuItemAt, ui::ButtonMenuItemModel*(int index)); | 1566 MOCK_CONST_METHOD1(GetButtonMenuItemAt, ui::ButtonMenuItemModel*(int index)); |
| (...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3381 // Set to non default value. | 3382 // Set to non default value. |
| 3382 v->layer()->set_scale_content(false); | 3383 v->layer()->set_scale_content(false); |
| 3383 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); | 3384 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); |
| 3384 ui::Layer* new_layer = v->layer(); | 3385 ui::Layer* new_layer = v->layer(); |
| 3385 EXPECT_FALSE(new_layer->scale_content()); | 3386 EXPECT_FALSE(new_layer->scale_content()); |
| 3386 } | 3387 } |
| 3387 | 3388 |
| 3388 #endif // USE_AURA | 3389 #endif // USE_AURA |
| 3389 | 3390 |
| 3390 } // namespace views | 3391 } // namespace views |
| OLD | NEW |