| 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 "chrome/browser/ui/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/host/root_window_host_factory.h" | 8 #include "ash/host/root_window_host_factory.h" |
| 9 #include "ash/launcher/launcher_types.h" | 9 #include "ash/launcher/launcher_types.h" |
| 10 #include "ash/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
| 11 #include "ash/shelf/shelf_widget.h" |
| 11 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
| 12 #include "ash/wm/window_properties.h" | 13 #include "ash/wm/window_properties.h" |
| 13 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
| 14 #include "base/bind.h" | 15 #include "base/bind.h" |
| 15 #include "base/command_line.h" | 16 #include "base/command_line.h" |
| 16 #include "base/prefs/pref_service.h" | 17 #include "base/prefs/pref_service.h" |
| 17 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 18 #include "chrome/browser/app_mode/app_mode_utils.h" | 19 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 19 #include "chrome/browser/lifetime/application_lifetime.h" | 20 #include "chrome/browser/lifetime/application_lifetime.h" |
| 20 #include "chrome/browser/profiles/profile_manager.h" | 21 #include "chrome/browser/profiles/profile_manager.h" |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 } | 288 } |
| 288 | 289 |
| 289 Browser* ChromeShellDelegate::GetTargetBrowser() { | 290 Browser* ChromeShellDelegate::GetTargetBrowser() { |
| 290 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); | 291 Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); |
| 291 if (browser) | 292 if (browser) |
| 292 return browser; | 293 return browser; |
| 293 return chrome::FindOrCreateTabbedBrowser( | 294 return chrome::FindOrCreateTabbedBrowser( |
| 294 ProfileManager::GetDefaultProfileOrOffTheRecord(), | 295 ProfileManager::GetDefaultProfileOrOffTheRecord(), |
| 295 chrome::HOST_DESKTOP_TYPE_ASH); | 296 chrome::HOST_DESKTOP_TYPE_ASH); |
| 296 } | 297 } |
| OLD | NEW |