Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(611)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 489763002: MacViews: Gets a webview working in views_examples_with_content_exe Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 } 777 }
778 778
779 // Assert that if |can_be_default| is false, the code above must have found a 779 // Assert that if |can_be_default| is false, the code above must have found a
780 // non-default partition. If this fails, the caller has a serious logic 780 // non-default partition. If this fails, the caller has a serious logic
781 // error about which StoragePartition they expect to be in and it is not 781 // error about which StoragePartition they expect to be in and it is not
782 // safe to continue. 782 // safe to continue.
783 CHECK(can_be_default || !partition_domain->empty()); 783 CHECK(can_be_default || !partition_domain->empty());
784 } 784 }
785 785
786 content::WebContentsViewDelegate* 786 content::WebContentsViewDelegate*
787 ChromeContentBrowserClient::GetWebContentsViewDelegate( 787 ChromeContentBrowserClient::GetWebContentsViewDelegate(
788 content::WebContents* web_contents) { 788 content::WebContents* web_contents,
789 return chrome::CreateWebContentsViewDelegate(web_contents); 789 gfx::NativeView context) {
790 return chrome::CreateWebContentsViewDelegate(web_contents, context);
790 } 791 }
791 792
792 void ChromeContentBrowserClient::RenderProcessWillLaunch( 793 void ChromeContentBrowserClient::RenderProcessWillLaunch(
793 content::RenderProcessHost* host) { 794 content::RenderProcessHost* host) {
794 int id = host->GetID(); 795 int id = host->GetID();
795 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); 796 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
796 net::URLRequestContextGetter* context = 797 net::URLRequestContextGetter* context =
797 profile->GetRequestContextForRenderProcess(id); 798 profile->GetRequestContextForRenderProcess(id);
798 799
799 host->AddFilter(new ChromeRenderMessageFilter(id, profile)); 800 host->AddFilter(new ChromeRenderMessageFilter(id, profile));
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 switches::kDisableWebRtcEncryption, 2586 switches::kDisableWebRtcEncryption,
2586 }; 2587 };
2587 to_command_line->CopySwitchesFrom(from_command_line, 2588 to_command_line->CopySwitchesFrom(from_command_line,
2588 kWebRtcDevSwitchNames, 2589 kWebRtcDevSwitchNames,
2589 arraysize(kWebRtcDevSwitchNames)); 2590 arraysize(kWebRtcDevSwitchNames));
2590 } 2591 }
2591 } 2592 }
2592 #endif // defined(ENABLE_WEBRTC) 2593 #endif // defined(ENABLE_WEBRTC)
2593 2594
2594 } // namespace chrome 2595 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698