| 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/macros.h" | 
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" | 
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" | 
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" | 
| 11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" | 
| 12 #include "chrome/browser/sync/profile_sync_service_factory.h" | 12 #include "chrome/browser/sync/profile_sync_service_factory.h" | 
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" | 
| 14 #include "chrome/browser/ui/browser_list_observer.h" | 14 #include "chrome/browser/ui/browser_list_observer.h" | 
| 15 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 15 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" | 
| 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 16 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 17 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 17 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h" | 
| 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" | 
| 19 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" | 19 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" | 
| 20 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h" | 20 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h" | 
| 21 #include "chrome/browser/ui/toolbar/app_menu_model.h" | 21 #include "chrome/browser/ui/toolbar/app_menu_model.h" | 
| 22 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" | 22 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" | 
| 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 23 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 
| 24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" | 
| 25 #include "chrome/grit/generated_resources.h" | 25 #include "chrome/grit/generated_resources.h" | 
| 26 #include "chrome/grit/theme_resources.h" | 26 #include "chrome/grit/theme_resources.h" | 
| 27 #include "chrome/test/base/testing_profile.h" | 27 #include "chrome/test/base/testing_profile.h" | 
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 262   BrowserRemovedObserver observer; | 262   BrowserRemovedObserver observer; | 
| 263   // This is normally called by ToolbarController, but since |controller_| is | 263   // This is normally called by ToolbarController, but since |controller_| is | 
| 264   // not owned by one, call it here. | 264   // not owned by one, call it here. | 
| 265   [controller_ browserWillBeDestroyed]; | 265   [controller_ browserWillBeDestroyed]; | 
| 266   CloseBrowserWindow(); | 266   CloseBrowserWindow(); | 
| 267   observer.WaitUntilBrowserRemoved(); | 267   observer.WaitUntilBrowserRemoved(); | 
| 268   // |controller_| is released in TearDown(). | 268   // |controller_| is released in TearDown(). | 
| 269 } | 269 } | 
| 270 | 270 | 
| 271 }  // namespace | 271 }  // namespace | 
| OLD | NEW | 
|---|