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

Side by Side Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 397017: reland 31875. Revert was:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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/browser/profile.cc ('k') | chrome/browser/spellcheck_host.h » ('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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "chrome/browser/renderer_host/browser_render_process_host.h" 8 #include "chrome/browser/renderer_host/browser_render_process_host.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/common/logging_chrome.h" 50 #include "chrome/common/logging_chrome.h"
51 #include "chrome/common/notification_service.h" 51 #include "chrome/common/notification_service.h"
52 #include "chrome/common/process_watcher.h" 52 #include "chrome/common/process_watcher.h"
53 #include "chrome/common/render_messages.h" 53 #include "chrome/common/render_messages.h"
54 #include "chrome/common/result_codes.h" 54 #include "chrome/common/result_codes.h"
55 #include "chrome/renderer/render_process.h" 55 #include "chrome/renderer/render_process.h"
56 #include "chrome/renderer/render_thread.h" 56 #include "chrome/renderer/render_thread.h"
57 #include "grit/generated_resources.h" 57 #include "grit/generated_resources.h"
58 #include "ipc/ipc_logging.h" 58 #include "ipc/ipc_logging.h"
59 #include "ipc/ipc_message.h" 59 #include "ipc/ipc_message.h"
60 #include "ipc/ipc_platform_file.h"
60 #include "ipc/ipc_switches.h" 61 #include "ipc/ipc_switches.h"
61 62
62 #if defined(OS_WIN) 63 #if defined(OS_WIN)
63 #include "app/win_util.h" 64 #include "app/win_util.h"
64 #include "chrome/browser/sandbox_policy.h" 65 #include "chrome/browser/sandbox_policy.h"
65 #elif defined(OS_LINUX) 66 #elif defined(OS_LINUX)
66 #include "base/singleton.h" 67 #include "base/singleton.h"
67 #include "chrome/browser/crash_handler_host_linux.h" 68 #include "chrome/browser/crash_handler_host_linux.h"
68 #include "chrome/browser/zygote_host_linux.h" 69 #include "chrome/browser/zygote_host_linux.h"
69 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h" 70 #include "chrome/browser/renderer_host/render_sandbox_host_linux.h"
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 } 1130 }
1130 1131
1131 void BrowserRenderProcessHost::AddSpellCheckWord(const std::string& word) { 1132 void BrowserRenderProcessHost::AddSpellCheckWord(const std::string& word) {
1132 Send(new ViewMsg_SpellChecker_WordAdded(word)); 1133 Send(new ViewMsg_SpellChecker_WordAdded(word));
1133 } 1134 }
1134 1135
1135 void BrowserRenderProcessHost::InitSpellChecker() { 1136 void BrowserRenderProcessHost::InitSpellChecker() {
1136 SpellCheckHost* spellcheck_host = profile()->GetSpellCheckHost(); 1137 SpellCheckHost* spellcheck_host = profile()->GetSpellCheckHost();
1137 if (spellcheck_host) { 1138 if (spellcheck_host) {
1138 PrefService* prefs = profile()->GetPrefs(); 1139 PrefService* prefs = profile()->GetPrefs();
1140 IPC::PlatformFileForTransit file;
1141 #if defined(OS_POSIX)
1142 file = base::FileDescriptor(spellcheck_host->bdict_file(), false);
1143 #elif defined(OS_WIN)
1144 ::DuplicateHandle(::GetCurrentProcess(), spellcheck_host->bdict_file(),
1145 GetHandle(), &file, 0, false, DUPLICATE_SAME_ACCESS);
1146 #endif
1139 Send(new ViewMsg_SpellChecker_Init( 1147 Send(new ViewMsg_SpellChecker_Init(
1140 spellcheck_host->bdict_fd(), spellcheck_host->custom_words(), 1148 file,
1149 spellcheck_host->custom_words(),
1141 spellcheck_host->language(), 1150 spellcheck_host->language(),
1142 prefs->GetBoolean(prefs::kEnableAutoSpellCorrect))); 1151 prefs->GetBoolean(prefs::kEnableAutoSpellCorrect)));
1143 } else { 1152 } else {
1144 Send(new ViewMsg_SpellChecker_Init( 1153 Send(new ViewMsg_SpellChecker_Init(
1145 base::FileDescriptor(), std::vector<std::string>(), std::string(), 1154 IPC::PlatformFileForTransit(),
1155 std::vector<std::string>(),
1156 std::string(),
1146 false)); 1157 false));
1147 } 1158 }
1148 } 1159 }
1149 1160
1150 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) { 1161 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) {
1151 Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable)); 1162 Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable));
1152 } 1163 }
1153 #endif 1164 #endif
OLDNEW
« no previous file with comments | « chrome/browser/profile.cc ('k') | chrome/browser/spellcheck_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698