OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <AppKit/AppKit.h> | 5 #import <AppKit/AppKit.h> |
6 | 6 |
7 #import "base/memory/scoped_nsobject.h" | 7 #import "base/memory/scoped_nsobject.h" |
8 #include "base/string16.h" | 8 #include "base/string16.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 14 matching lines...) Expand all Loading... |
25 menu_(menu) { | 25 menu_(menu) { |
26 } | 26 } |
27 virtual ~TestBookmarkMenuBridge() { | 27 virtual ~TestBookmarkMenuBridge() { |
28 [menu_ autorelease]; | 28 [menu_ autorelease]; |
29 } | 29 } |
30 | 30 |
31 NSMenu* menu_; | 31 NSMenu* menu_; |
32 | 32 |
33 protected: | 33 protected: |
34 // Overridden from BookmarkMenuBridge. | 34 // Overridden from BookmarkMenuBridge. |
35 virtual NSMenu* BookmarkMenu() { | 35 virtual NSMenu* BookmarkMenu() OVERRIDE { |
36 return menu_; | 36 return menu_; |
37 } | 37 } |
38 }; | 38 }; |
39 | 39 |
40 // TODO(jrg): see refactor comment in bookmark_bar_state_controller_unittest.mm | 40 // TODO(jrg): see refactor comment in bookmark_bar_state_controller_unittest.mm |
41 class BookmarkMenuBridgeTest : public CocoaProfileTest { | 41 class BookmarkMenuBridgeTest : public CocoaProfileTest { |
42 public: | 42 public: |
43 | 43 |
44 virtual void SetUp() { | 44 virtual void SetUp() { |
45 CocoaProfileTest::SetUp(); | 45 CocoaProfileTest::SetUp(); |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 EXPECT_TRUE([item image]); | 393 EXPECT_TRUE([item image]); |
394 | 394 |
395 model->SetTitle(node, ASCIIToUTF16("New Title")); | 395 model->SetTitle(node, ASCIIToUTF16("New Title")); |
396 | 396 |
397 item = [menu itemWithTitle:@"Test Item"]; | 397 item = [menu itemWithTitle:@"Test Item"]; |
398 EXPECT_FALSE(item); | 398 EXPECT_FALSE(item); |
399 item = [menu itemWithTitle:@"New Title"]; | 399 item = [menu itemWithTitle:@"New Title"]; |
400 EXPECT_TRUE(item); | 400 EXPECT_TRUE(item); |
401 } | 401 } |
402 | 402 |
OLD | NEW |