Hook up delegate interfaces so that athena can create its own WebContentsViewDelegate

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 "apps/shell/app/shell_main_delegate.h"
 #include "apps/shell/browser/shell_browser_main_delegate.h"
+#include "apps/shell/browser/shell_content_browser_client.h"
 #include "apps/shell/browser/shell_desktop_controller.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "apps/shell/common/switches.h"
 #include "apps/shell/renderer/shell_renderer_main_delegate.h"
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/athena_app_window_controller.h"
 #include "athena/main/athena_launcher.h"
 #include "athena/main/debug/debug_window.h"
@@ skipping 86 matching lines @@
     desktop->SetAppWindowController(new athena::AthenaAppWindowController());
     return desktop;
   }
 
  private:
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
+class AthenaContentBrowserClient : public apps::ShellContentBrowserClient {
+ public:
+  AthenaContentBrowserClient()
+      : apps::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {}
+  virtual ~AthenaContentBrowserClient() {}
+
+  // content::ContentBrowserClient:
+  virtual content::WebContentsViewDelegate* GetWebContentsViewDelegate(
+      content::WebContents* web_contents) OVERRIDE {
+    // TODO(oshima): Implement athena's WebContentsViewDelegate.
+    return NULL;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(AthenaContentBrowserClient);
+};
+
 class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate {
  public:
   AthenaRendererMainDelegate() {}
   virtual ~AthenaRendererMainDelegate() {}
 
  private:
   // apps::ShellRendererMainDelegate:
   virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {}
 
   virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE {
     athena::VirtualKeyboardBindings::Create(render_view);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate);
 };
 
 class AthenaMainDelegate : public apps::ShellMainDelegate {
  public:
   AthenaMainDelegate() {}
   virtual ~AthenaMainDelegate() {}
 
  private:
   // apps::ShellMainDelegate:
-  virtual apps::ShellBrowserMainDelegate* CreateShellBrowserMainDelegate()
+  virtual content::ContentBrowserClient* CreateShellContentBrowserClient()
       OVERRIDE {
-    return new AthenaBrowserMainDelegate();
+    return new AthenaContentBrowserClient();
   }
 
   virtual scoped_ptr<apps::ShellRendererMainDelegate>
   CreateShellRendererMainDelegate() OVERRIDE {
     return scoped_ptr<apps::ShellRendererMainDelegate>(
         new AthenaRendererMainDelegate());
   }
 
   virtual void InitializeResourceBundle() OVERRIDE {
     base::FilePath pak_dir;
     PathService::Get(base::DIR_MODULE, &pak_dir);
     base::FilePath pak_file =
         pak_dir.Append(FILE_PATH_LITERAL("athena_resources.pak"));
     ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaMainDelegate);
 };
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }