| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/extensions/launch_util.h" | 5 #include "chrome/browser/extensions/launch_util.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chrome/browser/extensions/extension_prefs.h" | |
| 10 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 11 #include "chrome/browser/ui/host_desktop.h" | 10 #include "chrome/browser/ui/host_desktop.h" |
| 12 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/extensions/extension_constants.h" | 12 #include "chrome/common/extensions/extension_constants.h" |
| 14 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" | 13 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" |
| 14 #include "extensions/browser/extension_prefs.h" |
| 15 #include "extensions/common/extension.h" | 15 #include "extensions/common/extension.h" |
| 16 | 16 |
| 17 #if defined(OS_WIN) | 17 #if defined(OS_WIN) |
| 18 #include "win8/util/win8_util.h" | 18 #include "win8/util/win8_util.h" |
| 19 #endif | 19 #endif |
| 20 | 20 |
| 21 #if defined(USE_ASH) | 21 #if defined(USE_ASH) |
| 22 #include "ash/shell.h" | 22 #include "ash/shell.h" |
| 23 #endif | 23 #endif |
| 24 | 24 |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs, | 142 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs, |
| 143 const Extension* extension) { | 143 const Extension* extension) { |
| 144 int value = -1; | 144 int value = -1; |
| 145 LaunchContainer manifest_launch_container = | 145 LaunchContainer manifest_launch_container = |
| 146 AppLaunchInfo::GetLaunchContainer(extension); | 146 AppLaunchInfo::GetLaunchContainer(extension); |
| 147 return manifest_launch_container == LAUNCH_CONTAINER_TAB && | 147 return manifest_launch_container == LAUNCH_CONTAINER_TAB && |
| 148 prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value); | 148 prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value); |
| 149 } | 149 } |
| 150 | 150 |
| 151 } // namespace extensions | 151 } // namespace extensions |
| OLD | NEW |