| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "grit/ui_resources.h" | |
| 11 #include "grit/ui_strings.h" | 10 #include "grit/ui_strings.h" |
| 12 #include "third_party/skia/include/core/SkBitmap.h" | 11 #include "third_party/skia/include/core/SkBitmap.h" |
| 13 #import "ui/base/cocoa/menu_controller.h" | 12 #import "ui/base/cocoa/menu_controller.h" |
| 14 #include "ui/base/models/simple_menu_model.h" | 13 #include "ui/base/models/simple_menu_model.h" |
| 15 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
| 16 #include "ui/gfx/image/image.h" | 15 #include "ui/gfx/image/image.h" |
| 17 #import "ui/gfx/test/ui_cocoa_test_helper.h" | 16 #import "ui/gfx/test/ui_cocoa_test_helper.h" |
| 17 #include "ui/resources/grit/ui_resources.h" |
| 18 | 18 |
| 19 using base::ASCIIToUTF16; | 19 using base::ASCIIToUTF16; |
| 20 | 20 |
| 21 namespace ui { | 21 namespace ui { |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 const int kTestLabelResourceId = IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE; | 25 const int kTestLabelResourceId = IDS_APP_SCROLLBAR_CXMENU_SCROLLHERE; |
| 26 | 26 |
| 27 class MenuControllerTest : public CocoaTest { | 27 class MenuControllerTest : public CocoaTest { |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 // Pump the task that notifies the delegate. | 394 // Pump the task that notifies the delegate. |
| 395 message_loop.RunUntilIdle(); | 395 message_loop.RunUntilIdle(); |
| 396 | 396 |
| 397 // Expect that the delegate got notified properly. | 397 // Expect that the delegate got notified properly. |
| 398 EXPECT_TRUE(delegate.did_close_); | 398 EXPECT_TRUE(delegate.did_close_); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace | 401 } // namespace |
| 402 | 402 |
| 403 } // namespace ui | 403 } // namespace ui |
| OLD | NEW |