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

Unified Diff: apps/shell/app_shell_browser_main_parts.cc

Issue 99053008: Rename apps::AppShell* to apps::Shell* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « apps/shell/app_shell_browser_main_parts.h ('k') | apps/shell/app_shell_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app_shell_browser_main_parts.cc
diff --git a/apps/shell/app_shell_browser_main_parts.cc b/apps/shell/app_shell_browser_main_parts.cc
deleted file mode 100644
index 7526bcfa546da2beb8e70342795cdc2e75dd9311..0000000000000000000000000000000000000000
--- a/apps/shell/app_shell_browser_main_parts.cc
+++ /dev/null
@@ -1,141 +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/app_shell_browser_main_parts.h"
-
-#include "apps/app_load_service.h"
-#include "apps/shell/app_shell_browser_context.h"
-#include "apps/shell/app_shell_extensions_browser_client.h"
-#include "apps/shell/web_view_window.h"
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
-#include "base/path_service.h"
-#include "base/run_loop.h"
-#include "chrome/common/chrome_paths.h"
-#include "chromeos/chromeos_paths.h"
-#include "content/public/common/result_codes.h"
-#include "extensions/common/extension_paths.h"
-#include "ui/aura/env.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/test/test_screen.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/screen.h"
-#include "ui/wm/test/wm_test_helper.h"
-
-namespace apps {
-
-AppShellBrowserMainParts::AppShellBrowserMainParts(
- const content::MainFunctionParams& parameters) {
-}
-
-AppShellBrowserMainParts::~AppShellBrowserMainParts() {
-}
-
-void AppShellBrowserMainParts::CreateRootWindow() {
- // TODO(jamescook): Replace this with a real Screen implementation.
- gfx::Screen::SetScreenInstance(
- gfx::SCREEN_TYPE_NATIVE, aura::TestScreen::Create());
- // Set up basic pieces of views::corewm.
- wm_test_helper_.reset(new wm::WMTestHelper(gfx::Size(800, 600)));
- // Ensure the X window gets mapped.
- wm_test_helper_->root_window()->host()->Show();
-}
-
-void AppShellBrowserMainParts::LoadAndLaunchApp(const base::FilePath& app_dir) {
- base::FilePath current_dir;
- CHECK(file_util::GetCurrentDirectory(&current_dir));
-
- // HACK: This allows us to see how far we can get without crashing.
- Profile* profile = reinterpret_cast<Profile*>(browser_context_.get());
- LOG(WARNING) << "-----------------------------------";
- LOG(WARNING) << "app_shell is expected to crash now.";
- LOG(WARNING) << "-----------------------------------";
-
- apps::AppLoadService* app_load_service =
- apps::AppLoadService::Get(profile);
- DCHECK(app_load_service);
- if (!app_load_service->LoadAndLaunch(
- app_dir, *CommandLine::ForCurrentProcess(), current_dir)) {
- LOG(ERROR) << "Unable to launch app at \"" << app_dir.value() << "\"";
- }
-}
-
-void AppShellBrowserMainParts::PreMainMessageLoopStart() {
- // TODO(jamescook): Initialize touch here?
-}
-
-void AppShellBrowserMainParts::PostMainMessageLoopStart() {
-}
-
-void AppShellBrowserMainParts::PreEarlyInitialization() {
-}
-
-int AppShellBrowserMainParts::PreCreateThreads() {
- // TODO(jamescook): Initialize chromeos::CrosSettings here?
-
- // Return no error.
- return 0;
-}
-
-void AppShellBrowserMainParts::PreMainMessageLoopRun() {
- // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
- // Set up all the paths to load files.
- chrome::RegisterPathProvider();
- chromeos::RegisterPathProvider();
- extensions::RegisterPathProvider();
-
- // The extensions system needs manifest data from the Chrome PAK file.
- base::FilePath resources_pack_path;
- PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
- ResourceBundle::GetSharedInstance().AddDataPackFromPath(
- resources_pack_path, ui::SCALE_FACTOR_NONE);
-
- // TODO(jamescook): Initialize chromeos::UserManager.
-
- // Initialize our "profile" equivalent.
- browser_context_.reset(new AppShellBrowserContext);
-
- // TODO(jamescook): Initialize ExtensionsClient.
- extensions_browser_client_.reset(
- new AppShellExtensionsBrowserClient(browser_context_.get()));
- extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
-
- // TODO(jamescook): Initialize policy::ProfilePolicyConnector.
- // TODO(jamescook): Initialize ExtensionSystem and InitForRegularProfile.
- // TODO(jamescook): CreateBrowserContextServices using
- // BrowserContextDependencyManager.
-
- CreateRootWindow();
-
- const std::string kAppSwitch = "app";
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(kAppSwitch)) {
- base::FilePath app_dir(command_line->GetSwitchValueNative(kAppSwitch));
- LoadAndLaunchApp(app_dir);
- } else {
- // TODO(jamescook): Create an apps::ShellWindow here. For now, create a
- // window with a WebView just to ensure that the content module is properly
- // initialized.
- ShowWebViewWindow(browser_context_.get(),
- wm_test_helper_->root_window()->window());
- }
-}
-
-bool AppShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
- base::RunLoop run_loop;
- run_loop.Run();
- *result_code = content::RESULT_CODE_NORMAL_EXIT;
- return true;
-}
-
-void AppShellBrowserMainParts::PostMainMessageLoopRun() {
- extensions::ExtensionsBrowserClient::Set(NULL);
- extensions_browser_client_.reset();
- browser_context_.reset();
- wm_test_helper_.reset();
- aura::Env::DeleteInstance();
-}
-
-} // namespace apps
« no previous file with comments | « apps/shell/app_shell_browser_main_parts.h ('k') | apps/shell/app_shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698