| 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 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/mac/scoped_nsobject.h" | 6 #include "base/mac/scoped_nsobject.h" |
| 7 #include "base/macros.h" |
| 7 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
| 11 #include "chrome/browser/sync/profile_sync_service_factory.h" | 12 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 12 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 13 #include "chrome/browser/ui/browser_list_observer.h" | 14 #include "chrome/browser/ui/browser_list_observer.h" |
| 14 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 15 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" |
| 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" |
| 16 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 17 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 BrowserRemovedObserver observer; | 263 BrowserRemovedObserver observer; |
| 263 // This is normally called by ToolbarController, but since |controller_| is | 264 // This is normally called by ToolbarController, but since |controller_| is |
| 264 // not owned by one, call it here. | 265 // not owned by one, call it here. |
| 265 [controller_ browserWillBeDestroyed]; | 266 [controller_ browserWillBeDestroyed]; |
| 266 CloseBrowserWindow(); | 267 CloseBrowserWindow(); |
| 267 observer.WaitUntilBrowserRemoved(); | 268 observer.WaitUntilBrowserRemoved(); |
| 268 // |controller_| is released in TearDown(). | 269 // |controller_| is released in TearDown(). |
| 269 } | 270 } |
| 270 | 271 |
| 271 } // namespace | 272 } // namespace |
| OLD | NEW |