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

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

Issue 6386009: Remove app/win/win_util.h,cc etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with NSApp changes in r73581 Created 9 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 | « chrome/browser/platform_util_win.cc ('k') | chrome/browser/tab_contents/thumbnail_generator.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) 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 // 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "ipc/ipc_message.h" 93 #include "ipc/ipc_message.h"
94 #include "ipc/ipc_platform_file.h" 94 #include "ipc/ipc_platform_file.h"
95 #include "ipc/ipc_switches.h" 95 #include "ipc/ipc_switches.h"
96 #include "media/base/media_switches.h" 96 #include "media/base/media_switches.h"
97 #include "ui/base/ui_base_switches.h" 97 #include "ui/base/ui_base_switches.h"
98 #include "webkit/fileapi/file_system_path_manager.h" 98 #include "webkit/fileapi/file_system_path_manager.h"
99 #include "webkit/plugins/plugin_switches.h" 99 #include "webkit/plugins/plugin_switches.h"
100 100
101 #if defined(OS_WIN) 101 #if defined(OS_WIN)
102 #include <objbase.h> 102 #include <objbase.h>
103 #include "app/win/win_util.h" 103 #include "chrome/common/section_util_win.h"
104 #endif 104 #endif
105 105
106 using WebKit::WebCache; 106 using WebKit::WebCache;
107 107
108 #include "third_party/skia/include/core/SkBitmap.h" 108 #include "third_party/skia/include/core/SkBitmap.h"
109 109
110 // TODO(mpcomplete): Remove this after fixing 110 // TODO(mpcomplete): Remove this after fixing
111 // http://code.google.com/p/chromium/issues/detail?id=53991 111 // http://code.google.com/p/chromium/issues/detail?id=53991
112 bool g_log_bug53991 = false; 112 bool g_log_bug53991 = false;
113 113
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 return false; 881 return false;
882 } 882 }
883 return channel_->SendWithTimeout(msg, timeout_ms); 883 return channel_->SendWithTimeout(msg, timeout_ms);
884 } 884 }
885 885
886 // This is a platform specific function for mapping a transport DIB given its id 886 // This is a platform specific function for mapping a transport DIB given its id
887 TransportDIB* BrowserRenderProcessHost::MapTransportDIB( 887 TransportDIB* BrowserRenderProcessHost::MapTransportDIB(
888 TransportDIB::Id dib_id) { 888 TransportDIB::Id dib_id) {
889 #if defined(OS_WIN) 889 #if defined(OS_WIN)
890 // On Windows we need to duplicate the handle from the remote process 890 // On Windows we need to duplicate the handle from the remote process
891 HANDLE section = app::win::GetSectionFromProcess( 891 HANDLE section = chrome::GetSectionFromProcess(
892 dib_id.handle, GetHandle(), false /* read write */); 892 dib_id.handle, GetHandle(), false /* read write */);
893 return TransportDIB::Map(section); 893 return TransportDIB::Map(section);
894 #elif defined(OS_MACOSX) 894 #elif defined(OS_MACOSX)
895 // On OSX, the browser allocates all DIBs and keeps a file descriptor around 895 // On OSX, the browser allocates all DIBs and keeps a file descriptor around
896 // for each. 896 // for each.
897 return widget_helper_->MapTransportDIB(dib_id); 897 return widget_helper_->MapTransportDIB(dib_id);
898 #elif defined(OS_POSIX) 898 #elif defined(OS_POSIX)
899 return TransportDIB::Map(dib_id); 899 return TransportDIB::Map(dib_id);
900 #endif // defined(OS_POSIX) 900 #endif // defined(OS_POSIX)
901 } 901 }
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1282 IPC::PlatformFileForTransit file; 1282 IPC::PlatformFileForTransit file;
1283 #if defined(OS_POSIX) 1283 #if defined(OS_POSIX)
1284 file = base::FileDescriptor(model_file, false); 1284 file = base::FileDescriptor(model_file, false);
1285 #elif defined(OS_WIN) 1285 #elif defined(OS_WIN)
1286 ::DuplicateHandle(::GetCurrentProcess(), model_file, GetHandle(), &file, 0, 1286 ::DuplicateHandle(::GetCurrentProcess(), model_file, GetHandle(), &file, 0,
1287 false, DUPLICATE_SAME_ACCESS); 1287 false, DUPLICATE_SAME_ACCESS);
1288 #endif 1288 #endif
1289 Send(new ViewMsg_SetPhishingModel(file)); 1289 Send(new ViewMsg_SetPhishingModel(file));
1290 } 1290 }
1291 } 1291 }
OLDNEW
« no previous file with comments | « chrome/browser/platform_util_win.cc ('k') | chrome/browser/tab_contents/thumbnail_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698