| 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 <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> | 
| 6 | 6 | 
| 7 #include "base/mac/foundation_util.h" | 7 #include "base/mac/foundation_util.h" | 
| 8 #include "base/mac/scoped_nsobject.h" | 8 #include "base/mac/scoped_nsobject.h" | 
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" | 
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" | 
| 11 #include "chrome/browser/ui/browser_tabstrip.h" | 11 #include "chrome/browser/ui/browser_tabstrip.h" | 
| 12 #include "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" | 12 #include "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h" | 
| 13 #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" | 13 #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" | 
| 14 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" | 14 #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" | 
| 15 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" | 15 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" | 
| 16 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 16 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h" | 
| 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 
| 18 #include "chrome/test/base/in_process_browser_test.h" | 18 #include "chrome/test/base/in_process_browser_test.h" | 
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" | 
| 20 #include "testing/gtest_mac.h" | 20 #include "testing/gtest_mac.h" | 
| 21 #include "ui/gfx/geometry/size.h" | 21 #include "ui/gfx/geometry/size.h" | 
| 22 | 22 | 
| 23 typedef InProcessBrowserTest BrowserCrApplicationAppleScriptTest; | 23 typedef InProcessBrowserTest BrowserCrApplicationAppleScriptTest; | 
| 24 | 24 | 
| 25 // Create windows of different |Type|. | 25 // Create windows of different |Type|. | 
| 26 IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, Creation) { | 26 IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, Creation) { | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 112                 [bookmarkFolder containerProperty]); | 112                 [bookmarkFolder containerProperty]); | 
| 113   } | 113   } | 
| 114 | 114 | 
| 115   BookmarkFolderAppleScript* otherBookmarks = | 115   BookmarkFolderAppleScript* otherBookmarks = | 
| 116       base::mac::ObjCCast<BookmarkFolderAppleScript>([NSApp otherBookmarks]); | 116       base::mac::ObjCCast<BookmarkFolderAppleScript>([NSApp otherBookmarks]); | 
| 117   EXPECT_NSEQ(@"Other Bookmarks", [otherBookmarks title]); | 117   EXPECT_NSEQ(@"Other Bookmarks", [otherBookmarks title]); | 
| 118   BookmarkFolderAppleScript* bookmarksBar = | 118   BookmarkFolderAppleScript* bookmarksBar = | 
| 119       base::mac::ObjCCast<BookmarkFolderAppleScript>([NSApp bookmarksBar]); | 119       base::mac::ObjCCast<BookmarkFolderAppleScript>([NSApp bookmarksBar]); | 
| 120   EXPECT_NSEQ(@"Bookmarks Bar", [bookmarksBar title]); | 120   EXPECT_NSEQ(@"Bookmarks Bar", [bookmarksBar title]); | 
| 121 } | 121 } | 
| OLD | NEW | 
|---|