Chromium Code Reviews| 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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 803 | 803 |
| 804 #if defined(USE_X11) | 804 #if defined(USE_X11) |
| 805 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); | 805 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); |
| 806 #endif | 806 #endif |
| 807 | 807 |
| 808 chrome::AddMetricsExtraParts(main_parts); | 808 chrome::AddMetricsExtraParts(main_parts); |
| 809 | 809 |
| 810 return main_parts; | 810 return main_parts; |
| 811 } | 811 } |
| 812 | 812 |
| 813 void ChromeContentBrowserClient::PostAfterStartupTask( | |
| 814 const tracked_objects::Location& from_here, | |
| 815 const scoped_refptr<base::TaskRunner>& task_runner, | |
| 816 const base::Closure& task) { | |
| 817 // TODO(michaeln): write me | |
|
jam
2015/03/05 17:05:03
It would be clearer while reviewing this cl if thi
| |
| 818 ContentBrowserClient::PostAfterStartupTask(from_here, task_runner, task); | |
| 819 } | |
| 820 | |
| 813 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( | 821 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( |
| 814 content::BrowserContext* browser_context, | 822 content::BrowserContext* browser_context, |
| 815 const GURL& site) { | 823 const GURL& site) { |
| 816 std::string partition_id; | 824 std::string partition_id; |
| 817 | 825 |
| 818 // The partition ID for webview guest processes is the string value of its | 826 // The partition ID for webview guest processes is the string value of its |
| 819 // SiteInstance URL - "chrome-guest://app_id/persist?partition". | 827 // SiteInstance URL - "chrome-guest://app_id/persist?partition". |
| 820 if (site.SchemeIs(content::kGuestScheme)) { | 828 if (site.SchemeIs(content::kGuestScheme)) { |
| 821 partition_id = site.spec(); | 829 partition_id = site.spec(); |
| 822 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { | 830 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { |
| (...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2662 switches::kDisableWebRtcEncryption, | 2670 switches::kDisableWebRtcEncryption, |
| 2663 }; | 2671 }; |
| 2664 to_command_line->CopySwitchesFrom(from_command_line, | 2672 to_command_line->CopySwitchesFrom(from_command_line, |
| 2665 kWebRtcDevSwitchNames, | 2673 kWebRtcDevSwitchNames, |
| 2666 arraysize(kWebRtcDevSwitchNames)); | 2674 arraysize(kWebRtcDevSwitchNames)); |
| 2667 } | 2675 } |
| 2668 } | 2676 } |
| 2669 #endif // defined(ENABLE_WEBRTC) | 2677 #endif // defined(ENABLE_WEBRTC) |
| 2670 | 2678 |
| 2671 } // namespace chrome | 2679 } // namespace chrome |
| OLD | NEW |