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 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1615 } | 1615 } |
1616 | 1616 |
1617 virtual Widget* GetWidget() OVERRIDE { | 1617 virtual Widget* GetWidget() OVERRIDE { |
1618 return widget_; | 1618 return widget_; |
1619 } | 1619 } |
1620 virtual const Widget* GetWidget() const OVERRIDE { | 1620 virtual const Widget* GetWidget() const OVERRIDE { |
1621 return widget_; | 1621 return widget_; |
1622 } | 1622 } |
1623 | 1623 |
1624 // ButtonListener implementation. | 1624 // ButtonListener implementation. |
1625 virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE { | 1625 virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE { |
1626 last_pressed_button_ = sender; | 1626 last_pressed_button_ = sender; |
1627 } | 1627 } |
1628 | 1628 |
1629 void ResetStates() { | 1629 void ResetStates() { |
1630 oked_ = false; | 1630 oked_ = false; |
1631 canceled_ = false; | 1631 canceled_ = false; |
1632 last_pressed_button_ = NULL; | 1632 last_pressed_button_ = NULL; |
1633 } | 1633 } |
1634 | 1634 |
1635 // Set up expectations for methods that are called when an (empty) menu is | 1635 // Set up expectations for methods that are called when an (empty) menu is |
(...skipping 1725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3361 // Set to non default value. | 3361 // Set to non default value. |
3362 v->layer()->set_scale_content(false); | 3362 v->layer()->set_scale_content(false); |
3363 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); | 3363 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); |
3364 ui::Layer* new_layer = v->layer(); | 3364 ui::Layer* new_layer = v->layer(); |
3365 EXPECT_FALSE(new_layer->scale_content()); | 3365 EXPECT_FALSE(new_layer->scale_content()); |
3366 } | 3366 } |
3367 | 3367 |
3368 #endif // USE_AURA | 3368 #endif // USE_AURA |
3369 | 3369 |
3370 } // namespace views | 3370 } // namespace views |
OLD | NEW |