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

Side by Side Diff: content/browser/worker_host/worker_process_host.cc

Issue 7777004: Initialize the resource bundle now that it is used due to http://trac.webkit.org/changeset/93879. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: v3 Created 9 years, 3 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 | « chrome/app/chrome_main.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/worker_host/worker_process_host.h" 5 #include "content/browser/worker_host/worker_process_host.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 21 matching lines...) Expand all
32 #include "content/browser/worker_host/worker_message_filter.h" 32 #include "content/browser/worker_host/worker_message_filter.h"
33 #include "content/browser/worker_host/worker_service.h" 33 #include "content/browser/worker_host/worker_service.h"
34 #include "content/common/content_switches.h" 34 #include "content/common/content_switches.h"
35 #include "content/common/debug_flags.h" 35 #include "content/common/debug_flags.h"
36 #include "content/common/result_codes.h" 36 #include "content/common/result_codes.h"
37 #include "content/common/view_messages.h" 37 #include "content/common/view_messages.h"
38 #include "content/common/worker_messages.h" 38 #include "content/common/worker_messages.h"
39 #include "net/base/mime_util.h" 39 #include "net/base/mime_util.h"
40 #include "ipc/ipc_switches.h" 40 #include "ipc/ipc_switches.h"
41 #include "net/base/registry_controlled_domain.h" 41 #include "net/base/registry_controlled_domain.h"
42 #include "ui/base/ui_base_switches.h"
42 #include "webkit/fileapi/file_system_context.h" 43 #include "webkit/fileapi/file_system_context.h"
43 #include "webkit/fileapi/file_system_path_manager.h" 44 #include "webkit/fileapi/file_system_path_manager.h"
44 #include "webkit/fileapi/sandbox_mount_point_provider.h" 45 #include "webkit/fileapi/sandbox_mount_point_provider.h"
45 #include "webkit/glue/resource_type.h" 46 #include "webkit/glue/resource_type.h"
46 47
47 namespace { 48 namespace {
48 49
49 // Helper class that we pass to SocketStreamDispatcherHost so that it can find 50 // Helper class that we pass to SocketStreamDispatcherHost so that it can find
50 // the right net::URLRequestContext for a request. 51 // the right net::URLRequestContext for a request.
51 class URLRequestContextSelector 52 class URLRequestContextSelector
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 int flags = CHILD_NORMAL; 125 int flags = CHILD_NORMAL;
125 #endif 126 #endif
126 127
127 FilePath exe_path = GetChildPath(flags); 128 FilePath exe_path = GetChildPath(flags);
128 if (exe_path.empty()) 129 if (exe_path.empty())
129 return false; 130 return false;
130 131
131 CommandLine* cmd_line = new CommandLine(exe_path); 132 CommandLine* cmd_line = new CommandLine(exe_path);
132 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kWorkerProcess); 133 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kWorkerProcess);
133 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id()); 134 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id());
135 std::string locale =
136 content::GetContentClient()->browser()->GetApplicationLocale();
137 cmd_line->AppendSwitchASCII(switches::kLang, locale);
134 138
135 static const char* const kSwitchNames[] = { 139 static const char* const kSwitchNames[] = {
136 switches::kWebWorkerShareProcesses, 140 switches::kWebWorkerShareProcesses,
137 switches::kDisableApplicationCache, 141 switches::kDisableApplicationCache,
138 switches::kDisableDatabases, 142 switches::kDisableDatabases,
139 switches::kEnableLogging, 143 switches::kEnableLogging,
140 switches::kLoggingLevel, 144 switches::kLoggingLevel,
141 switches::kDisableWebSockets, 145 switches::kDisableWebSockets,
142 #if defined(OS_WIN) 146 #if defined(OS_WIN)
143 switches::kDisableDesktopNotifications, 147 switches::kDisableDesktopNotifications,
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 } 642 }
639 } 643 }
640 return false; 644 return false;
641 } 645 }
642 646
643 WorkerProcessHost::WorkerInstance::FilterInfo 647 WorkerProcessHost::WorkerInstance::FilterInfo
644 WorkerProcessHost::WorkerInstance::GetFilter() const { 648 WorkerProcessHost::WorkerInstance::GetFilter() const {
645 DCHECK(NumFilters() == 1); 649 DCHECK(NumFilters() == 1);
646 return *filters_.begin(); 650 return *filters_.begin();
647 } 651 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698