Minimal athena shell main

apps/shell/app/shell_main_delegate.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 "apps/shell/app/shell_main_delegate.h"
 
 #include "apps/shell/browser/shell_content_browser_client.h"
 #include "apps/shell/common/shell_content_client.h"
+#include "apps/shell/common/shell_delegate.h"
 #include "apps/shell/renderer/shell_content_renderer_client.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/extension_paths.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 12 matching lines @@
   settings.log_file = log_filename.value().c_str();
   settings.delete_old = logging::DELETE_OLD_LOG_FILE;
   logging::InitLogging(settings);
   logging::SetLogItems(true, true, true, true);
 }
 
 }  // namespace
 
 namespace apps {
 
-ShellMainDelegate::ShellMainDelegate() {
+ShellMainDelegate::ShellMainDelegate(ShellDelegate* shell_delegate)
+    : shell_delegate_(shell_delegate) {
 }
 
 ShellMainDelegate::~ShellMainDelegate() {
 }
 
 bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
   InitLogging();
   content_client_.reset(new ShellContentClient);
   SetContentClient(content_client_.get());
 
 #if defined(OS_CHROMEOS)
   chromeos::RegisterPathProvider();
 #endif
   extensions::RegisterPathProvider();
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
   std::string process_type =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessType);
   if (ProcessNeedsResourceBundle(process_type))
     InitializeResourceBundle();
 }
 
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(new apps::ShellContentBrowserClient);
+  browser_client_.reset(new apps::ShellContentBrowserClient(shell_delegate_));
   return browser_client_.get();
 }
 
 content::ContentRendererClient*
 ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 // static
 bool ShellMainDelegate::ProcessNeedsResourceBundle(
     const std::string& process_type) {
   // The browser process has no process type flag, but needs resources.
   // On Linux the zygote process opens the resources for the renderers.
   return process_type.empty() ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kRendererProcess ||
          process_type == switches::kUtilityProcess;
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
   base::FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
   ui::ResourceBundle::InitSharedInstanceWithPakPath(
       pak_dir.AppendASCII("app_shell.pak"));
 }
 
 }  // namespace apps