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/background/background_contents_service.h" | 5 #include "chrome/browser/background/background_contents_service.h" |
6 | 6 |
7 #include "apps/app_load_service.h" | 7 #include "apps/app_load_service.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/chrome_notification_types.h" | 23 #include "chrome/browser/chrome_notification_types.h" |
24 #include "chrome/browser/extensions/extension_service.h" | 24 #include "chrome/browser/extensions/extension_service.h" |
25 #include "chrome/browser/notifications/notification.h" | 25 #include "chrome/browser/notifications/notification.h" |
26 #include "chrome/browser/notifications/notification_delegate.h" | 26 #include "chrome/browser/notifications/notification_delegate.h" |
27 #include "chrome/browser/notifications/notification_ui_manager.h" | 27 #include "chrome/browser/notifications/notification_ui_manager.h" |
28 #include "chrome/browser/profiles/profile.h" | 28 #include "chrome/browser/profiles/profile.h" |
29 #include "chrome/browser/profiles/profile_manager.h" | 29 #include "chrome/browser/profiles/profile_manager.h" |
30 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
31 #include "chrome/browser/ui/browser_finder.h" | 31 #include "chrome/browser/ui/browser_finder.h" |
32 #include "chrome/browser/ui/browser_tabstrip.h" | 32 #include "chrome/browser/ui/browser_tabstrip.h" |
33 #include "chrome/browser/ui/host_desktop.h" | |
34 #include "chrome/common/extensions/extension_constants.h" | 33 #include "chrome/common/extensions/extension_constants.h" |
35 #include "chrome/common/pref_names.h" | 34 #include "chrome/common/pref_names.h" |
36 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
37 #include "components/prefs/pref_service.h" | 36 #include "components/prefs/pref_service.h" |
38 #include "components/prefs/scoped_user_pref_update.h" | 37 #include "components/prefs/scoped_user_pref_update.h" |
39 #include "content/public/browser/notification_service.h" | 38 #include "content/public/browser/notification_service.h" |
40 #include "content/public/browser/site_instance.h" | 39 #include "content/public/browser/site_instance.h" |
41 #include "content/public/browser/web_contents.h" | 40 #include "content/public/browser/web_contents.h" |
42 #include "extensions/browser/extension_host.h" | 41 #include "extensions/browser/extension_host.h" |
43 #include "extensions/browser/extension_registry.h" | 42 #include "extensions/browser/extension_registry.h" |
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
777 return base::EmptyString16(); | 776 return base::EmptyString16(); |
778 } | 777 } |
779 | 778 |
780 void BackgroundContentsService::AddWebContents( | 779 void BackgroundContentsService::AddWebContents( |
781 WebContents* new_contents, | 780 WebContents* new_contents, |
782 WindowOpenDisposition disposition, | 781 WindowOpenDisposition disposition, |
783 const gfx::Rect& initial_rect, | 782 const gfx::Rect& initial_rect, |
784 bool user_gesture, | 783 bool user_gesture, |
785 bool* was_blocked) { | 784 bool* was_blocked) { |
786 Browser* browser = chrome::FindLastActiveWithProfile( | 785 Browser* browser = chrome::FindLastActiveWithProfile( |
787 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 786 Profile::FromBrowserContext(new_contents->GetBrowserContext())); |
788 chrome::GetActiveDesktop()); | |
789 if (browser) { | 787 if (browser) { |
790 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 788 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
791 initial_rect, user_gesture, was_blocked); | 789 initial_rect, user_gesture, was_blocked); |
792 } | 790 } |
793 } | 791 } |
OLD | NEW |