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

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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 "content/shell/browser/shell_content_browser_client.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ skipping 283 matching lines @@
           : new ShellResourceDispatcherHostDelegate);
   ResourceDispatcherHost::Get()->SetDelegate(
       resource_dispatcher_host_delegate_.get());
 }
 
 std::string ShellContentBrowserClient::GetDefaultDownloadName() {
   return "download";
 }
 
 WebContentsViewDelegate* ShellContentBrowserClient::GetWebContentsViewDelegate(
-    WebContents* web_contents) {
+    WebContents* web_contents,
+    gfx::NativeView context) {
 #if !defined(USE_AURA)
   return CreateShellWebContentsViewDelegate(web_contents);
 #else
   return NULL;
 #endif
 }
 
 QuotaPermissionContext*
 ShellContentBrowserClient::CreateQuotaPermissionContext() {
   return new ShellQuotaPermissionContext();
@@ skipping 118 matching lines @@
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content