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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" |
9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/test/base/testing_profile.h" | 21 #include "chrome/test/base/testing_profile.h" |
22 #include "components/bookmarks/browser/bookmark_model.h" | 22 #include "components/bookmarks/browser/bookmark_model.h" |
23 #include "components/signin/core/browser/signin_manager.h" | 23 #include "components/signin/core/browser/signin_manager.h" |
24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
25 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
26 #import "testing/gtest_mac.h" | 26 #import "testing/gtest_mac.h" |
27 #include "testing/platform_test.h" | 27 #include "testing/platform_test.h" |
28 | 28 |
29 using base::ASCIIToUTF16; | 29 using base::ASCIIToUTF16; |
30 using bookmarks::BookmarkModel; | 30 using bookmarks::BookmarkModel; |
| 31 using bookmarks::BookmarkNode; |
31 using content::WebContents; | 32 using content::WebContents; |
32 | 33 |
33 // Watch for bookmark pulse notifications so we can confirm they were sent. | 34 // Watch for bookmark pulse notifications so we can confirm they were sent. |
34 @interface BookmarkPulseObserver : NSObject { | 35 @interface BookmarkPulseObserver : NSObject { |
35 int notifications_; | 36 int notifications_; |
36 } | 37 } |
37 @property (assign, nonatomic) int notifications; | 38 @property (assign, nonatomic) int notifications; |
38 @end | 39 @end |
39 | 40 |
40 | 41 |
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 // Normally this would be sent up the responder tree correctly, but since | 483 // Normally this would be sent up the responder tree correctly, but since |
483 // tests run in the background, key window and main window are never set on | 484 // tests run in the background, key window and main window are never set on |
484 // NSApplication. Adding it to NSApplication directly removes the need for | 485 // NSApplication. Adding it to NSApplication directly removes the need for |
485 // worrying about what the current window with focus is. | 486 // worrying about what the current window with focus is. |
486 - (void)editBookmarkNode:(id)sender { | 487 - (void)editBookmarkNode:(id)sender { |
487 EXPECT_TRUE([sender respondsToSelector:@selector(node)]); | 488 EXPECT_TRUE([sender respondsToSelector:@selector(node)]); |
488 BookmarkBubbleControllerTest::edits_++; | 489 BookmarkBubbleControllerTest::edits_++; |
489 } | 490 } |
490 | 491 |
491 @end | 492 @end |
OLD | NEW |