| 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/mac/scoped_nsobject.h" | 7 #include "base/mac/scoped_nsobject.h" | 
| 8 #include "base/macros.h" | 8 #include "base/macros.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" | 
| 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 11 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
| 12 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 12 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 
| 13 #include "chrome/browser/signin/signin_manager_factory.h" | 13 #include "chrome/browser/signin/signin_manager_factory.h" | 
| 14 #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h" | 14 #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h" | 
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" | 
| 16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.h" | 
| 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" | 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" | 
| 18 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 18 #include "chrome/browser/ui/cocoa/browser_window_controller.h" | 
| 19 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |  | 
| 20 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 19 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 
|  | 20 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 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/bookmarks/managed/managed_bookmark_service.h" | 23 #include "components/bookmarks/managed/managed_bookmark_service.h" | 
| 24 #include "components/signin/core/browser/signin_manager.h" | 24 #include "components/signin/core/browser/signin_manager.h" | 
| 25 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" | 
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" | 
| 27 #import "testing/gtest_mac.h" | 27 #import "testing/gtest_mac.h" | 
| 28 #include "testing/platform_test.h" | 28 #include "testing/platform_test.h" | 
| 29 #include "ui/base/material_design/material_design_controller.h" | 29 #include "ui/base/material_design/material_design_controller.h" | 
| 30 | 30 | 
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 478 // Normally this would be sent up the responder tree correctly, but since | 478 // Normally this would be sent up the responder tree correctly, but since | 
| 479 // tests run in the background, key window and main window are never set on | 479 // tests run in the background, key window and main window are never set on | 
| 480 // NSApplication. Adding it to NSApplication directly removes the need for | 480 // NSApplication. Adding it to NSApplication directly removes the need for | 
| 481 // worrying about what the current window with focus is. | 481 // worrying about what the current window with focus is. | 
| 482 - (void)editBookmarkNode:(id)sender { | 482 - (void)editBookmarkNode:(id)sender { | 
| 483   EXPECT_TRUE([sender respondsToSelector:@selector(node)]); | 483   EXPECT_TRUE([sender respondsToSelector:@selector(node)]); | 
| 484   BookmarkBubbleControllerTest::edits_++; | 484   BookmarkBubbleControllerTest::edits_++; | 
| 485 } | 485 } | 
| 486 | 486 | 
| 487 @end | 487 @end | 
| OLD | NEW | 
|---|