| 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 "chrome/browser/ui/cocoa/status_bubble_mac.h" | 5 #import "chrome/browser/ui/cocoa/status_bubble_mac.h" | 
| 6 | 6 | 
| 7 #include <Cocoa/Cocoa.h> | 7 #include <Cocoa/Cocoa.h> | 
| 8 | 8 | 
| 9 #include <memory> | 9 #include <memory> | 
| 10 | 10 | 
| 11 #include "base/mac/scoped_nsobject.h" | 11 #include "base/mac/scoped_nsobject.h" | 
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" | 
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" | 
| 14 #import "chrome/browser/ui/cocoa/bubble_view.h" | 14 #import "chrome/browser/ui/cocoa/bubble_view.h" | 
| 15 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 15 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" | 
| 16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" | 
| 17 #import "testing/gtest_mac.h" | 17 #import "testing/gtest_mac.h" | 
| 18 #include "testing/platform_test.h" | 18 #include "testing/platform_test.h" | 
| 19 #import "third_party/ocmock/OCMock/OCMock.h" | 19 #import "third_party/ocmock/OCMock/OCMock.h" | 
| 20 #include "ui/gfx/geometry/point.h" | 20 #include "ui/gfx/geometry/point.h" | 
| 21 #include "url/gurl.h" | 21 #include "url/gurl.h" | 
| 22 | 22 | 
| 23 using base::UTF8ToUTF16; | 23 using base::UTF8ToUTF16; | 
| 24 | 24 | 
| 25 // The test delegate records all of the status bubble object's state | 25 // The test delegate records all of the status bubble object's state | 
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 675                                     backing:NSBackingStoreBuffered | 675                                     backing:NSBackingStoreBuffered | 
| 676                                       defer:NO]); | 676                                       defer:NO]); | 
| 677 | 677 | 
| 678   // Switch parents with the bubble hidden. | 678   // Switch parents with the bubble hidden. | 
| 679   bubble_->SwitchParentWindow(fullscreenParent); | 679   bubble_->SwitchParentWindow(fullscreenParent); | 
| 680 | 680 | 
| 681   // Switch back to the original parent with the bubble showing. | 681   // Switch back to the original parent with the bubble showing. | 
| 682   bubble_->SetStatus(UTF8ToUTF16("Showing")); | 682   bubble_->SetStatus(UTF8ToUTF16("Showing")); | 
| 683   bubble_->SwitchParentWindow(test_window()); | 683   bubble_->SwitchParentWindow(test_window()); | 
| 684 } | 684 } | 
| OLD | NEW | 
|---|