| 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/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 // Create a profile asynchronously and run the loop until its creation | 184 // Create a profile asynchronously and run the loop until its creation |
| 185 // is complete. | 185 // is complete. |
| 186 base::RunLoop run_loop; | 186 base::RunLoop run_loop; |
| 187 | 187 |
| 188 ProfileManager::CreateCallback create_callback = | 188 ProfileManager::CreateCallback create_callback = |
| 189 base::Bind(&CreateProfileCallback, run_loop.QuitClosure()); | 189 base::Bind(&CreateProfileCallback, run_loop.QuitClosure()); |
| 190 profile_manager->CreateProfileAsync( | 190 profile_manager->CreateProfileAsync( |
| 191 profile_manager->user_data_dir().Append("test"), | 191 profile_manager->user_data_dir().Append("test"), |
| 192 create_callback, | 192 create_callback, |
| 193 ASCIIToUTF16("avatar_test"), | 193 base::ASCIIToUTF16("avatar_test"), |
| 194 base::string16(), | 194 base::string16(), |
| 195 std::string()); | 195 std::string()); |
| 196 | 196 |
| 197 run_loop.Run(); | 197 run_loop.Run(); |
| 198 | 198 |
| 199 // There should now be two profiles, and the avatar button and fullscreen | 199 // There should now be two profiles, and the avatar button and fullscreen |
| 200 // button are both visible. | 200 // button are both visible. |
| 201 EXPECT_EQ(2u, profile_manager->GetNumberOfProfiles()); | 201 EXPECT_EQ(2u, profile_manager->GetNumberOfProfiles()); |
| 202 EXPECT_FALSE([avatar isHidden]); | 202 EXPECT_FALSE([avatar isHidden]); |
| 203 EXPECT_FALSE([fullscreen_button isHidden]); | 203 EXPECT_FALSE([fullscreen_button isHidden]); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 StatusBubblePositioning) { | 378 StatusBubblePositioning) { |
| 379 NSPoint origin = [controller() statusBubbleBaseFrame].origin; | 379 NSPoint origin = [controller() statusBubbleBaseFrame].origin; |
| 380 | 380 |
| 381 DevToolsWindow* devtools_window = DevToolsWindow::ToggleDevToolsWindow( | 381 DevToolsWindow* devtools_window = DevToolsWindow::ToggleDevToolsWindow( |
| 382 browser(), DevToolsToggleAction::Show()); | 382 browser(), DevToolsToggleAction::Show()); |
| 383 SetDevToolsWindowContentsInsets(devtools_window, 10, 10, 10, 10); | 383 SetDevToolsWindowContentsInsets(devtools_window, 10, 10, 10, 10); |
| 384 | 384 |
| 385 NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin; | 385 NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin; |
| 386 EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools)); | 386 EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools)); |
| 387 } | 387 } |
| OLD | NEW |