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

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

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 years, 5 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) 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/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<>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #endif 43 #endif
44 44
45 #if defined(OS_MACOSX) 45 #if defined(OS_MACOSX)
46 #include "base/mac/mac_util.h" 46 #include "base/mac/mac_util.h"
47 #include "content/common/plugin_carbon_interpose_constants_mac.h" 47 #include "content/common/plugin_carbon_interpose_constants_mac.h"
48 #include "ui/gfx/rect.h" 48 #include "ui/gfx/rect.h"
49 #endif 49 #endif
50 50
51 #if defined(OS_WIN) 51 #if defined(OS_WIN)
52 #include "base/win/windows_version.h" 52 #include "base/win/windows_version.h"
53 #include "content/common/plugin_constants_win.h"
53 #include "content/public/common/sandboxed_process_launcher_delegate.h" 54 #include "content/public/common/sandboxed_process_launcher_delegate.h"
54 #include "webkit/plugins/npapi/plugin_constants_win.h"
55 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
56 #endif 55 #endif
57 56
58 namespace content { 57 namespace content {
59 58
60 #if defined(OS_WIN) 59 #if defined(OS_WIN)
61 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) { 60 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) {
62 // The window is destroyed at this point, we just care about its parent, which 61 // The window is destroyed at this point, we just care about its parent, which
63 // is the intermediate window we created. 62 // is the intermediate window we created.
64 std::set<HWND>::iterator window_index = 63 std::set<HWND>::iterator window_index =
65 plugin_parent_windows_set_.find(parent); 64 plugin_parent_windows_set_.find(parent);
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 void PluginProcessHost::OnChannelCreated( 408 void PluginProcessHost::OnChannelCreated(
410 const IPC::ChannelHandle& channel_handle) { 409 const IPC::ChannelHandle& channel_handle) {
411 Client* client = sent_requests_.front(); 410 Client* client = sent_requests_.front();
412 411
413 if (client) 412 if (client)
414 client->OnChannelOpened(channel_handle); 413 client->OnChannelOpened(channel_handle);
415 sent_requests_.pop_front(); 414 sent_requests_.pop_front();
416 } 415 }
417 416
418 } // namespace content 417 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698