| 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 1726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1737 EXPECT_TRUE(test_dialog_->last_pressed_button_ == | 1737 EXPECT_TRUE(test_dialog_->last_pressed_button_ == |
| 1738 test_dialog_->button2_); | 1738 test_dialog_->button2_); |
| 1739 break; | 1739 break; |
| 1740 } | 1740 } |
| 1741 test_dialog_->ResetStates(); | 1741 test_dialog_->ResetStates(); |
| 1742 } | 1742 } |
| 1743 | 1743 |
| 1744 FocusManager* focus_manager_; | 1744 FocusManager* focus_manager_; |
| 1745 TestDialog* test_dialog_; | 1745 TestDialog* test_dialog_; |
| 1746 DialogClientView* client_view_; | 1746 DialogClientView* client_view_; |
| 1747 NativeTextButton* ok_button_; | 1747 TextButton* ok_button_; |
| 1748 NativeTextButton* cancel_button_; | 1748 TextButton* cancel_button_; |
| 1749 }; | 1749 }; |
| 1750 | 1750 |
| 1751 TEST_F(DefaultButtonTest, DialogDefaultButtonTest) { | 1751 TEST_F(DefaultButtonTest, DialogDefaultButtonTest) { |
| 1752 // Window has just been shown, we expect the default button specified in the | 1752 // Window has just been shown, we expect the default button specified in the |
| 1753 // DialogDelegate. | 1753 // DialogDelegate. |
| 1754 EXPECT_TRUE(ok_button_->is_default()); | 1754 EXPECT_TRUE(ok_button_->is_default()); |
| 1755 | 1755 |
| 1756 // Simulate pressing enter, that should trigger the OK button. | 1756 // Simulate pressing enter, that should trigger the OK button. |
| 1757 SimulatePressingEnterAndCheckDefaultButton(OK); | 1757 SimulatePressingEnterAndCheckDefaultButton(OK); |
| 1758 | 1758 |
| (...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3383 // Set to non default value. | 3383 // Set to non default value. |
| 3384 v->layer()->set_scale_content(false); | 3384 v->layer()->set_scale_content(false); |
| 3385 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); | 3385 scoped_ptr<ui::Layer> old_layer(v->RecreateLayer()); |
| 3386 ui::Layer* new_layer = v->layer(); | 3386 ui::Layer* new_layer = v->layer(); |
| 3387 EXPECT_FALSE(new_layer->scale_content()); | 3387 EXPECT_FALSE(new_layer->scale_content()); |
| 3388 } | 3388 } |
| 3389 | 3389 |
| 3390 #endif // USE_AURA | 3390 #endif // USE_AURA |
| 3391 | 3391 |
| 3392 } // namespace views | 3392 } // namespace views |
| OLD | NEW |