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

Side by Side Diff: content/browser/plugin_process_host.cc

Issue 7046114: Remove content dependency on chrome/browser/accessibility/browser_accessibility_state.h and chrom... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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
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/plugin_process_host.h" 5 #include "content/browser/plugin_process_host.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #elif defined(OS_POSIX) 9 #elif defined(OS_POSIX)
10 #include <utility> // for pair<> 10 #include <utility> // for pair<>
11 #endif 11 #endif
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/file_path.h" 16 #include "base/file_path.h"
17 #include "base/file_util.h" 17 #include "base/file_util.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/logging_chrome.h" 23 #include "chrome/common/logging_chrome.h"
25 #include "content/browser/browser_thread.h" 24 #include "content/browser/browser_thread.h"
26 #include "content/browser/content_browser_client.h" 25 #include "content/browser/content_browser_client.h"
27 #include "content/browser/resolve_proxy_msg_helper.h" 26 #include "content/browser/resolve_proxy_msg_helper.h"
28 #include "content/browser/plugin_service.h" 27 #include "content/browser/plugin_service.h"
29 #include "content/browser/renderer_host/resource_dispatcher_host.h" 28 #include "content/browser/renderer_host/resource_dispatcher_host.h"
30 #include "content/browser/renderer_host/resource_message_filter.h" 29 #include "content/browser/renderer_host/resource_message_filter.h"
30 #include "content/common/content_switches.h"
31 #include "content/common/plugin_messages.h" 31 #include "content/common/plugin_messages.h"
32 #include "content/common/resource_messages.h" 32 #include "content/common/resource_messages.h"
33 #include "ipc/ipc_switches.h" 33 #include "ipc/ipc_switches.h"
34 #include "ui/base/ui_base_switches.h" 34 #include "ui/base/ui_base_switches.h"
35 #include "ui/gfx/native_widget_types.h" 35 #include "ui/gfx/native_widget_types.h"
36 #include "ui/gfx/gl/gl_switches.h" 36 #include "ui/gfx/gl/gl_switches.h"
37 37
38 #if defined(USE_X11) 38 #if defined(USE_X11)
39 #include "ui/gfx/gtk_native_view_id_manager.h" 39 #include "ui/gfx/gtk_native_view_id_manager.h"
40 #endif 40 #endif
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 // Propagate the following switches to the plugin command line (along with 184 // Propagate the following switches to the plugin command line (along with
185 // any associated values) if present in the browser command line 185 // any associated values) if present in the browser command line
186 static const char* const kSwitchNames[] = { 186 static const char* const kSwitchNames[] = {
187 switches::kDisableBreakpad, 187 switches::kDisableBreakpad,
188 switches::kDisableLogging, 188 switches::kDisableLogging,
189 switches::kEnableDCHECK, 189 switches::kEnableDCHECK,
190 switches::kEnableLogging, 190 switches::kEnableLogging,
191 switches::kEnableStatsTable, 191 switches::kEnableStatsTable,
192 switches::kFullMemoryCrashReport, 192 switches::kFullMemoryCrashReport,
193 switches::kLoggingLevel, 193 switches::kLoggingLevel,
194 #if defined(OS_CHROMEOS)
195 switches::kLoginProfile,
196 #endif
197 switches::kLogPluginMessages, 194 switches::kLogPluginMessages,
198 switches::kMemoryProfiling,
199 switches::kNoSandbox, 195 switches::kNoSandbox,
200 switches::kPluginStartupDialog, 196 switches::kPluginStartupDialog,
201 switches::kSilentDumpOnDCHECK,
202 switches::kTestSandbox, 197 switches::kTestSandbox,
203 switches::kUseGL, 198 switches::kUseGL,
204 switches::kUserAgent, 199 switches::kUserAgent,
205 switches::kUserDataDir,
206 switches::kV, 200 switches::kV,
207 }; 201 };
208 202
209 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 203 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
210 arraysize(kSwitchNames)); 204 arraysize(kSwitchNames));
211 205
212 // If specified, prepend a launcher program to the command line. 206 // If specified, prepend a launcher program to the command line.
213 if (!plugin_launcher.empty()) 207 if (!plugin_launcher.empty())
214 cmd_line->PrependWrapper(plugin_launcher); 208 cmd_line->PrependWrapper(plugin_launcher);
215 209
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 350 }
357 } 351 }
358 352
359 void PluginProcessHost::OnChannelCreated( 353 void PluginProcessHost::OnChannelCreated(
360 const IPC::ChannelHandle& channel_handle) { 354 const IPC::ChannelHandle& channel_handle) {
361 Client* client = sent_requests_.front(); 355 Client* client = sent_requests_.front();
362 356
363 client->OnChannelOpened(channel_handle); 357 client->OnChannelOpened(channel_handle);
364 sent_requests_.pop(); 358 sent_requests_.pop();
365 } 359 }
OLDNEW
« no previous file with comments | « content/browser/in_process_webkit/indexed_db_browsertest.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698