STASH: Epic Experimental patch for toolkit-views App List on Mac

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 773 matching lines @@
   }
 
   // Assert that if |can_be_default| is false, the code above must have found a
   // non-default partition.  If this fails, the caller has a serious logic
   // error about which StoragePartition they expect to be in and it is not
   // safe to continue.
   CHECK(can_be_default || !partition_domain->empty());
 }
 
 content::WebContentsViewDelegate*
-    ChromeContentBrowserClient::GetWebContentsViewDelegate(
-        content::WebContents* web_contents) {
+ChromeContentBrowserClient::GetWebContentsViewDelegate(
+    content::WebContents* web_contents,
+    gfx::NativeView context) {
 #if defined(USE_ATHENA)
-  return athena::CreateWebContentsViewDelegate(web_contents);
+  return athena::CreateWebContentsViewDelegate(web_contents, context);
 #else
-  return chrome::CreateWebContentsViewDelegate(web_contents);
+  return chrome::CreateWebContentsViewDelegate(web_contents, context);
 #endif
 }
 
 void ChromeContentBrowserClient::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   int id = host->GetID();
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
   net::URLRequestContextGetter* context =
       profile->GetRequestContextForRenderProcess(id);
 
@@ skipping 1830 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome