Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Unified Diff: apps/shell/shell_main_delegate.cc

Issue 151893002: Reorganize apps/shell into app, browser and common directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: subdirs Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: apps/shell/shell_main_delegate.cc
diff --git a/apps/shell/shell_main_delegate.cc b/apps/shell/shell_main_delegate.cc
deleted file mode 100644
index 2406ca97786017b432098b2cb42f68a66e930a3f..0000000000000000000000000000000000000000
--- a/apps/shell/shell_main_delegate.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// 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/shell_main_delegate.h"
-
-#include "apps/shell/shell_content_browser_client.h"
-#include "apps/shell/shell_content_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 "ui/base/resource/resource_bundle.h"
-
-namespace {
-
-void InitLogging() {
- base::FilePath log_filename;
- PathService::Get(base::DIR_EXE, &log_filename);
- log_filename = log_filename.AppendASCII("app_shell.log");
- logging::LoggingSettings settings;
- settings.logging_dest = logging::LOG_TO_ALL;
- 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() {
-}
-
-bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
- InitLogging();
- content_client_.reset(new ShellContentClient);
- SetContentClient(content_client_.get());
- return false;
-}
-
-void ShellMainDelegate::PreSandboxStartup() {
- InitializeResourceBundle();
-}
-
-content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
- browser_client_.reset(new apps::ShellContentBrowserClient);
- return browser_client_.get();
-}
-
-content::ContentRendererClient*
-ShellMainDelegate::CreateContentRendererClient() {
- // TODO(jamescook): Create a ShellContentRendererClient with the extensions
- // initialization pieces of ChromeContentRendererClient.
- return content::ContentMainDelegate::CreateContentRendererClient();
-}
-
-void ShellMainDelegate::InitializeResourceBundle() {
- ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
-}
-
-} // namespace apps

Powered by Google App Engine
This is Rietveld 408576698