| 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 "chrome/browser/ui/cocoa/browser_window_controller.h" | 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 6 | 6 |
| 7 #import "base/mac/mac_util.h" | 7 #import "base/mac/mac_util.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 enum { | 42 enum { |
| 43 NSWindowDocumentVersionsButton = 6, | 43 NSWindowDocumentVersionsButton = 6, |
| 44 NSWindowFullScreenButton | 44 NSWindowFullScreenButton |
| 45 }; | 45 }; |
| 46 #endif // MAC_OS_X_VERSION_10_7 | 46 #endif // MAC_OS_X_VERSION_10_7 |
| 47 | 47 |
| 48 void CreateProfileCallback(const base::Closure& quit_closure, | 48 void CreateProfileCallback(const base::Closure& quit_closure, |
| 49 Profile* profile, | 49 Profile* profile, |
| 50 Profile::CreateStatus status) { | 50 Profile::CreateStatus status) { |
| 51 EXPECT_TRUE(profile); | 51 EXPECT_TRUE(profile); |
| 52 EXPECT_NE(Profile::CREATE_STATUS_FAIL, status); | 52 EXPECT_NE(Profile::CREATE_STATUS_LOCAL_FAIL, status); |
| 53 EXPECT_NE(Profile::CREATE_STATUS_REMOTE_FAIL, status); |
| 53 // This will be called multiple times. Wait until the profile is initialized | 54 // This will be called multiple times. Wait until the profile is initialized |
| 54 // fully to quit the loop. | 55 // fully to quit the loop. |
| 55 if (status == Profile::CREATE_STATUS_INITIALIZED) | 56 if (status == Profile::CREATE_STATUS_INITIALIZED) |
| 56 quit_closure.Run(); | 57 quit_closure.Run(); |
| 57 } | 58 } |
| 58 | 59 |
| 59 enum ViewID { | 60 enum ViewID { |
| 60 VIEW_ID_TOOLBAR, | 61 VIEW_ID_TOOLBAR, |
| 61 VIEW_ID_BOOKMARK_BAR, | 62 VIEW_ID_BOOKMARK_BAR, |
| 62 VIEW_ID_INFO_BAR, | 63 VIEW_ID_INFO_BAR, |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); | 608 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); |
| 608 | 609 |
| 609 ShowInstantResults(); | 610 ShowInstantResults(); |
| 610 EXPECT_TRUE( | 611 EXPECT_TRUE( |
| 611 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); | 612 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); |
| 612 | 613 |
| 613 HideInstant(); | 614 HideInstant(); |
| 614 EXPECT_FALSE( | 615 EXPECT_FALSE( |
| 615 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); | 616 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); |
| 616 } | 617 } |
| OLD | NEW |