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

Side by Side Diff: content/shell/shell_main_delegate.cc

Issue 9372027: Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_main.cc ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_main_delegate.h" 5 #include "content/shell/shell_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 25 matching lines...) Expand all
36 36
37 InitializeResourceBundle(); 37 InitializeResourceBundle();
38 } 38 }
39 39
40 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) { 40 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) {
41 } 41 }
42 42
43 int ShellMainDelegate::RunProcess( 43 int ShellMainDelegate::RunProcess(
44 const std::string& process_type, 44 const std::string& process_type,
45 const content::MainFunctionParams& main_function_params) { 45 const content::MainFunctionParams& main_function_params) {
46 NOTREACHED();
46 return -1; 47 return -1;
47 } 48 }
48 49
49 void ShellMainDelegate::ProcessExiting(const std::string& process_type) { 50 void ShellMainDelegate::ProcessExiting(const std::string& process_type) {
50 } 51 }
51 52
52 #if defined(OS_MACOSX) 53 #if defined(OS_MACOSX)
53 bool ShellMainDelegate::ProcessRegistersWithSystemProcess( 54 bool ShellMainDelegate::ProcessRegistersWithSystemProcess(
54 const std::string& process_type) { 55 const std::string& process_type) {
55 return false; 56 return false;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 95 }
95 } 96 }
96 97
97 void ShellMainDelegate::InitializeResourceBundle() { 98 void ShellMainDelegate::InitializeResourceBundle() {
98 FilePath pak_dir; 99 FilePath pak_dir;
99 PathService::Get(base::DIR_MODULE, &pak_dir); 100 PathService::Get(base::DIR_MODULE, &pak_dir);
100 101
101 FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak")); 102 FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
102 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file); 103 ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
103 } 104 }
OLDNEW
« no previous file with comments | « content/shell/shell_main.cc ('k') | content/test/content_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698