| 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/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 MSG_ROUTING_NONE, | 632 MSG_ROUTING_NONE, |
| 633 profile, | 633 profile, |
| 634 frame_name, | 634 frame_name, |
| 635 application_id, | 635 application_id, |
| 636 std::string(), | 636 std::string(), |
| 637 NULL); | 637 NULL); |
| 638 | 638 |
| 639 // TODO(atwilson): Create RenderViews asynchronously to avoid increasing | 639 // TODO(atwilson): Create RenderViews asynchronously to avoid increasing |
| 640 // startup latency (http://crbug.com/47236). | 640 // startup latency (http://crbug.com/47236). |
| 641 contents->web_contents()->GetController().LoadURL( | 641 contents->web_contents()->GetController().LoadURL( |
| 642 url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string()); | 642 url, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); |
| 643 } | 643 } |
| 644 | 644 |
| 645 BackgroundContents* BackgroundContentsService::CreateBackgroundContents( | 645 BackgroundContents* BackgroundContentsService::CreateBackgroundContents( |
| 646 SiteInstance* site, | 646 SiteInstance* site, |
| 647 int routing_id, | 647 int routing_id, |
| 648 Profile* profile, | 648 Profile* profile, |
| 649 const base::string16& frame_name, | 649 const base::string16& frame_name, |
| 650 const base::string16& application_id, | 650 const base::string16& application_id, |
| 651 const std::string& partition_id, | 651 const std::string& partition_id, |
| 652 content::SessionStorageNamespace* session_storage_namespace) { | 652 content::SessionStorageNamespace* session_storage_namespace) { |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 774 bool user_gesture, | 774 bool user_gesture, |
| 775 bool* was_blocked) { | 775 bool* was_blocked) { |
| 776 Browser* browser = chrome::FindLastActiveWithProfile( | 776 Browser* browser = chrome::FindLastActiveWithProfile( |
| 777 Profile::FromBrowserContext(new_contents->GetBrowserContext()), | 777 Profile::FromBrowserContext(new_contents->GetBrowserContext()), |
| 778 chrome::GetActiveDesktop()); | 778 chrome::GetActiveDesktop()); |
| 779 if (browser) { | 779 if (browser) { |
| 780 chrome::AddWebContents(browser, NULL, new_contents, disposition, | 780 chrome::AddWebContents(browser, NULL, new_contents, disposition, |
| 781 initial_pos, user_gesture, was_blocked); | 781 initial_pos, user_gesture, was_blocked); |
| 782 } | 782 } |
| 783 } | 783 } |
| OLD | NEW |