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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 794 | 794 |
| 795 #if defined(USE_X11) | 795 #if defined(USE_X11) |
| 796 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); | 796 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); |
| 797 #endif | 797 #endif |
| 798 | 798 |
| 799 chrome::AddMetricsExtraParts(main_parts); | 799 chrome::AddMetricsExtraParts(main_parts); |
| 800 | 800 |
| 801 return main_parts; | 801 return main_parts; |
| 802 } | 802 } |
| 803 | 803 |
| 804 content::AfterStartupTaskPoster* | |
| 805 ChromeContentBrowserClient::GetAfterStartupTaskPoster() { | |
| 806 // todo: write me | |
|
michaeln
2015/03/03 02:41:41
I'll flesh this out after the content public api i
| |
| 807 return ContentBrowserClient::GetAfterStartupTaskPoster(); | |
| 808 } | |
| 809 | |
| 804 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( | 810 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( |
| 805 content::BrowserContext* browser_context, | 811 content::BrowserContext* browser_context, |
| 806 const GURL& site) { | 812 const GURL& site) { |
| 807 std::string partition_id; | 813 std::string partition_id; |
| 808 | 814 |
| 809 // The partition ID for webview guest processes is the string value of its | 815 // The partition ID for webview guest processes is the string value of its |
| 810 // SiteInstance URL - "chrome-guest://app_id/persist?partition". | 816 // SiteInstance URL - "chrome-guest://app_id/persist?partition". |
| 811 if (site.SchemeIs(content::kGuestScheme)) { | 817 if (site.SchemeIs(content::kGuestScheme)) { |
| 812 partition_id = site.spec(); | 818 partition_id = site.spec(); |
| 813 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { | 819 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { |
| (...skipping 1831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2645 switches::kDisableWebRtcEncryption, | 2651 switches::kDisableWebRtcEncryption, |
| 2646 }; | 2652 }; |
| 2647 to_command_line->CopySwitchesFrom(from_command_line, | 2653 to_command_line->CopySwitchesFrom(from_command_line, |
| 2648 kWebRtcDevSwitchNames, | 2654 kWebRtcDevSwitchNames, |
| 2649 arraysize(kWebRtcDevSwitchNames)); | 2655 arraysize(kWebRtcDevSwitchNames)); |
| 2650 } | 2656 } |
| 2651 } | 2657 } |
| 2652 #endif // defined(ENABLE_WEBRTC) | 2658 #endif // defined(ENABLE_WEBRTC) |
| 2653 | 2659 |
| 2654 } // namespace chrome | 2660 } // namespace chrome |
| OLD | NEW |