| 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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 EXPECT_EQ(0, [menu numberOfItems]); | 253 EXPECT_EQ(0, [menu numberOfItems]); |
| 254 | 254 |
| 255 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, | 255 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, |
| 256 IDS_BOOMARK_BAR_OPEN_ALL, root, menu, true); | 256 IDS_BOOMARK_BAR_OPEN_ALL, root, menu, true); |
| 257 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, | 257 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, |
| 258 IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); | 258 IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); |
| 259 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, | 259 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, |
| 260 IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, true); | 260 IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, true); |
| 261 EXPECT_EQ(3, [menu numberOfItems]); | 261 EXPECT_EQ(3, [menu numberOfItems]); |
| 262 | 262 |
| 263 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_ALL); | 263 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); |
| 264 item = [menu itemWithTitle:title]; | 264 item = [menu itemWithTitle:title]; |
| 265 EXPECT_TRUE(item); | 265 EXPECT_TRUE(item); |
| 266 EXPECT_EQ(@selector(openAllBookmarks:), [item action]); | 266 EXPECT_EQ(@selector(openAllBookmarks:), [item action]); |
| 267 EXPECT_TRUE([item isEnabled]); | 267 EXPECT_TRUE([item isEnabled]); |
| 268 | 268 |
| 269 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); | 269 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); |
| 270 item = [menu itemWithTitle:title]; | 270 item = [menu itemWithTitle:title]; |
| 271 EXPECT_TRUE(item); | 271 EXPECT_TRUE(item); |
| 272 EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]); | 272 EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]); |
| 273 EXPECT_TRUE([item isEnabled]); | 273 EXPECT_TRUE([item isEnabled]); |
| 274 | 274 |
| 275 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_INCOGNITO); | 275 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); |
| 276 item = [menu itemWithTitle:title]; | 276 item = [menu itemWithTitle:title]; |
| 277 EXPECT_TRUE(item); | 277 EXPECT_TRUE(item); |
| 278 EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]); | 278 EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]); |
| 279 EXPECT_TRUE([item isEnabled]); | 279 EXPECT_TRUE([item isEnabled]); |
| 280 | 280 |
| 281 ClearBookmarkMenu(bridge_.get(), menu); | 281 ClearBookmarkMenu(bridge_.get(), menu); |
| 282 EXPECT_EQ(0, [menu numberOfItems]); | 282 EXPECT_EQ(0, [menu numberOfItems]); |
| 283 | 283 |
| 284 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, | 284 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, |
| 285 IDS_BOOMARK_BAR_OPEN_ALL, root, menu, false); | 285 IDS_BOOMARK_BAR_OPEN_ALL, root, menu, false); |
| 286 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, | 286 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, |
| 287 IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); | 287 IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); |
| 288 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, | 288 AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, |
| 289 IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, false); | 289 IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, false); |
| 290 EXPECT_EQ(3, [menu numberOfItems]); | 290 EXPECT_EQ(3, [menu numberOfItems]); |
| 291 | 291 |
| 292 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_ALL); | 292 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); |
| 293 item = [menu itemWithTitle:title]; | 293 item = [menu itemWithTitle:title]; |
| 294 EXPECT_TRUE(item); | 294 EXPECT_TRUE(item); |
| 295 EXPECT_EQ(nil, [item action]); | 295 EXPECT_EQ(nil, [item action]); |
| 296 EXPECT_FALSE([item isEnabled]); | 296 EXPECT_FALSE([item isEnabled]); |
| 297 | 297 |
| 298 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); | 298 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); |
| 299 item = [menu itemWithTitle:title]; | 299 item = [menu itemWithTitle:title]; |
| 300 EXPECT_TRUE(item); | 300 EXPECT_TRUE(item); |
| 301 EXPECT_EQ(nil, [item action]); | 301 EXPECT_EQ(nil, [item action]); |
| 302 EXPECT_FALSE([item isEnabled]); | 302 EXPECT_FALSE([item isEnabled]); |
| 303 | 303 |
| 304 title = l10n_util::GetNSString(IDS_BOOMARK_BAR_OPEN_INCOGNITO); | 304 title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); |
| 305 item = [menu itemWithTitle:title]; | 305 item = [menu itemWithTitle:title]; |
| 306 EXPECT_TRUE(item); | 306 EXPECT_TRUE(item); |
| 307 EXPECT_EQ(nil, [item action]); | 307 EXPECT_EQ(nil, [item action]); |
| 308 EXPECT_FALSE([item isEnabled]); | 308 EXPECT_FALSE([item isEnabled]); |
| 309 } | 309 } |
| 310 | 310 |
| 311 // Makes sure our internal map of BookmarkNode to NSMenuItem works. | 311 // Makes sure our internal map of BookmarkNode to NSMenuItem works. |
| 312 TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) { | 312 TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) { |
| 313 string16 empty; | 313 string16 empty; |
| 314 NSMenu* menu = bridge_->menu_; | 314 NSMenu* menu = bridge_->menu_; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 EXPECT_TRUE([item image]); | 392 EXPECT_TRUE([item image]); |
| 393 | 393 |
| 394 model->SetTitle(node, ASCIIToUTF16("New Title")); | 394 model->SetTitle(node, ASCIIToUTF16("New Title")); |
| 395 | 395 |
| 396 item = [menu itemWithTitle:@"Test Item"]; | 396 item = [menu itemWithTitle:@"Test Item"]; |
| 397 EXPECT_FALSE(item); | 397 EXPECT_FALSE(item); |
| 398 item = [menu itemWithTitle:@"New Title"]; | 398 item = [menu itemWithTitle:@"New Title"]; |
| 399 EXPECT_TRUE(item); | 399 EXPECT_TRUE(item); |
| 400 } | 400 } |
| 401 | 401 |
| OLD | NEW |