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

Unified Diff: apps/shell/shell_browser_main_parts.cc

Issue 149163002: app_shell: Add ShellContentRendererClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (content_renderer_client) 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
« no previous file with comments | « apps/shell/renderer/shell_content_renderer_client.cc ('k') | apps/shell/shell_extensions_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/shell_browser_main_parts.cc
diff --git a/apps/shell/shell_browser_main_parts.cc b/apps/shell/shell_browser_main_parts.cc
index 3750dd52e574e62688c499c546bff855c27078d6..27d4a765d003a81e96d2147709db348b87ee5af0 100644
--- a/apps/shell/shell_browser_main_parts.cc
+++ b/apps/shell/shell_browser_main_parts.cc
@@ -12,14 +12,11 @@
#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 "components/browser_context_keyed_service/browser_context_dependency_manager.h"
#include "content/public/common/result_codes.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/renderer_startup_helper.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"
@@ -28,10 +25,6 @@
#include "ui/gfx/screen.h"
#include "ui/wm/test/wm_test_helper.h"
-#if defined(OS_CHROMEOS)
-#include "chromeos/chromeos_paths.h"
-#endif
-
using content::BrowserContext;
using extensions::Extension;
using extensions::ExtensionSystem;
@@ -75,18 +68,6 @@ int ShellBrowserMainParts::PreCreateThreads() {
void ShellBrowserMainParts::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();
-#if defined(OS_CHROMEOS)
- chromeos::RegisterPathProvider();
-#endif
- 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.
« no previous file with comments | « apps/shell/renderer/shell_content_renderer_client.cc ('k') | apps/shell/shell_extensions_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698