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

Side by Side Diff: content/plugin/webplugin_delegate_stub.cc

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « content/content_browser.gypi ('k') | content/renderer/render_view.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 #include "content/plugin/webplugin_delegate_stub.h" 5 #include "content/plugin/webplugin_delegate_stub.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 if (params.arg_names.size() != params.arg_values.size()) { 155 if (params.arg_names.size() != params.arg_values.size()) {
156 NOTREACHED(); 156 NOTREACHED();
157 return; 157 return;
158 } 158 }
159 159
160 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 160 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
161 FilePath path = 161 FilePath path =
162 command_line.GetSwitchValuePath(switches::kPluginPath); 162 command_line.GetSwitchValuePath(switches::kPluginPath);
163 163
164 gfx::PluginWindowHandle parent = gfx::kNullPluginWindow; 164 gfx::PluginWindowHandle parent = gfx::kNullPluginWindow;
165 #if defined(USE_AURA) 165 #if defined(OS_WIN)
166 // Nothing.
167 #elif defined(OS_WIN)
168 parent = gfx::NativeViewFromId(params.containing_window); 166 parent = gfx::NativeViewFromId(params.containing_window);
169 #elif defined(OS_LINUX) 167 #elif defined(OS_LINUX)
170 // This code is disabled, See issue 17110. 168 // This code is disabled, See issue 17110.
171 // The problem is that the XID can change at arbitrary times (e.g. when the 169 // The problem is that the XID can change at arbitrary times (e.g. when the
172 // tab is detached then reattached), so we need to be able to track these 170 // tab is detached then reattached), so we need to be able to track these
173 // changes, and let the PluginInstance know. 171 // changes, and let the PluginInstance know.
174 // PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId( 172 // PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId(
175 // params.containing_window, &parent)); 173 // params.containing_window, &parent));
176 #endif 174 #endif
177 175
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 delegate_->CreateSeekableResourceClient(resource_id, range_request_id); 390 delegate_->CreateSeekableResourceClient(resource_id, range_request_id);
393 webplugin_->OnResourceCreated(resource_id, resource_client); 391 webplugin_->OnResourceCreated(resource_id, resource_client);
394 } 392 }
395 393
396 #if defined(OS_MACOSX) 394 #if defined(OS_MACOSX)
397 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle( 395 void WebPluginDelegateStub::OnSetFakeAcceleratedSurfaceWindowHandle(
398 gfx::PluginWindowHandle window) { 396 gfx::PluginWindowHandle window) {
399 delegate_->set_windowed_handle(window); 397 delegate_->set_windowed_handle(window);
400 } 398 }
401 #endif 399 #endif
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/render_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698