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/views/ash/extension_utils.h" | 5 #include "chrome/browser/ui/views/ash/extension_utils.h" |
6 | 6 |
7 #include "chrome/browser/event_disposition.h" | 7 #include "chrome/browser/event_disposition.h" |
8 #include "chrome/browser/extensions/extension_prefs.h" | 8 #include "chrome/browser/extensions/extension_prefs.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 } else if (disposition == NEW_WINDOW) { | 36 } else if (disposition == NEW_WINDOW) { |
37 // Force a new window open. | 37 // Force a new window open. |
38 application_launch::OpenApplication( | 38 application_launch::OpenApplication( |
39 profile, extension, extension_misc::LAUNCH_WINDOW, url, | 39 profile, extension, extension_misc::LAUNCH_WINDOW, url, |
40 disposition, NULL); | 40 disposition, NULL); |
41 } else { | 41 } else { |
42 // Look at preference to find the right launch container. If no preference | 42 // Look at preference to find the right launch container. If no preference |
43 // is set, launch as a regular tab. | 43 // is set, launch as a regular tab. |
44 extension_misc::LaunchContainer launch_container = | 44 extension_misc::LaunchContainer launch_container = |
45 profile->GetExtensionService()->extension_prefs()->GetLaunchContainer( | 45 profile->GetExtensionService()->extension_prefs()->GetLaunchContainer( |
46 extension, ExtensionPrefs::LAUNCH_DEFAULT); | 46 extension, extensions::ExtensionPrefs::LAUNCH_DEFAULT); |
47 | 47 |
48 application_launch::OpenApplication( | 48 application_launch::OpenApplication( |
49 profile, extension, launch_container, GURL(url), | 49 profile, extension, launch_container, GURL(url), |
50 NEW_FOREGROUND_TAB, NULL); | 50 NEW_FOREGROUND_TAB, NULL); |
51 } | 51 } |
52 } | 52 } |
53 | 53 |
54 } // namespace extension_utils | 54 } // namespace extension_utils |
OLD | NEW |