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

athena/main/athena_main.cc

 // Copyright 2014 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 "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/env/public/athena_env.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "athena/main/athena_content_client.h"
@@ skipping 110 matching lines @@
 class AthenaContentBrowserClient
     : public extensions::ShellContentBrowserClient {
  public:
   AthenaContentBrowserClient()
       : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
   }
   virtual ~AthenaContentBrowserClient() {}
 
   // content::ContentBrowserClient:
   virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
-      content::WebContents* web_contents) override {
+      content::WebContents* web_contents, gfx::NativeView context) override {
     return athena::CreateWebContentsViewDelegate(web_contents);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient);
 };
 
 class AthenaContentRendererClient
     : public extensions::ShellContentRendererClient {
  public:
@@ skipping 48 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }