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

Side by Side Diff: ppapi/proxy/ppb_flash_proxy.cc

Issue 10736039: Re-enabled PPAPI crash url for non-windows platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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
« no previous file with comments | « no previous file | no next file » | 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) 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 "ppapi/proxy/ppb_flash_proxy.h" 5 #include "ppapi/proxy/ppb_flash_proxy.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/time.h" 9 #include "base/time.h"
10 #include "build/build_config.h"
10 #include "ppapi/c/dev/ppb_font_dev.h" 11 #include "ppapi/c/dev/ppb_font_dev.h"
11 #include "ppapi/c/dev/ppb_var_deprecated.h" 12 #include "ppapi/c/dev/ppb_var_deprecated.h"
12 #include "ppapi/c/pp_errors.h" 13 #include "ppapi/c/pp_errors.h"
13 #include "ppapi/c/pp_resource.h" 14 #include "ppapi/c/pp_resource.h"
14 #include "ppapi/c/private/ppb_flash.h" 15 #include "ppapi/c/private/ppb_flash.h"
15 #include "ppapi/c/private/ppb_flash_print.h" 16 #include "ppapi/c/private/ppb_flash_print.h"
16 #include "ppapi/proxy/host_dispatcher.h" 17 #include "ppapi/proxy/host_dispatcher.h"
17 #include "ppapi/proxy/pepper_file_messages.h" 18 #include "ppapi/proxy/pepper_file_messages.h"
18 #include "ppapi/proxy/plugin_dispatcher.h" 19 #include "ppapi/proxy/plugin_dispatcher.h"
19 #include "ppapi/proxy/plugin_globals.h" 20 #include "ppapi/proxy/plugin_globals.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 return PP_MakeInt32(plugin_dispatcher->preferences().number_of_cpu_cores); 306 return PP_MakeInt32(plugin_dispatcher->preferences().number_of_cpu_cores);
306 } 307 }
307 return PP_MakeUndefined(); 308 return PP_MakeUndefined();
308 } 309 }
309 310
310 PP_Bool PPB_Flash_Proxy::SetCrashData(PP_Instance instance, 311 PP_Bool PPB_Flash_Proxy::SetCrashData(PP_Instance instance,
311 PP_FlashCrashKey key, 312 PP_FlashCrashKey key,
312 PP_Var value) { 313 PP_Var value) {
313 switch (key) { 314 switch (key) {
314 case PP_FLASHCRASHKEY_URL: 315 case PP_FLASHCRASHKEY_URL:
315 // TODO(raymes): This may be breaking crash reporting, see: 316 #if defined(OS_WIN)
317 // TODO(raymes): This may be breaking crash reporting on Windows, see:
316 // See https://code.google.com/p/chromium/issues/detail?id=135480. 318 // See https://code.google.com/p/chromium/issues/detail?id=135480.
317 // Disable temporarily. 319 // Disable temporarily.
318 return PP_FALSE; 320 return PP_FALSE;
321 #endif
319 322
320 StringVar *url_string_var(StringVar::FromPPVar(value)); 323 StringVar *url_string_var(StringVar::FromPPVar(value));
321 if (!url_string_var) 324 if (!url_string_var)
322 return PP_FALSE; 325 return PP_FALSE;
323 std::string url_string(url_string_var->value()); 326 std::string url_string(url_string_var->value());
324 PluginGlobals::Get()->plugin_proxy_delegate()->SetActiveURL(url_string); 327 PluginGlobals::Get()->plugin_proxy_delegate()->SetActiveURL(url_string);
325 return PP_TRUE; 328 return PP_TRUE;
326 } 329 }
327 return PP_FALSE; 330 return PP_FALSE;
328 } 331 }
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 // It's rarely used enough that we just request this interface when needed. 855 // It's rarely used enough that we just request this interface when needed.
853 const PPB_Flash_Print_1_0* print_interface = 856 const PPB_Flash_Print_1_0* print_interface =
854 static_cast<const PPB_Flash_Print_1_0*>( 857 static_cast<const PPB_Flash_Print_1_0*>(
855 dispatcher()->local_get_interface()(PPB_FLASH_PRINT_INTERFACE_1_0)); 858 dispatcher()->local_get_interface()(PPB_FLASH_PRINT_INTERFACE_1_0));
856 if (print_interface) 859 if (print_interface)
857 print_interface->InvokePrinting(instance); 860 print_interface->InvokePrinting(instance);
858 } 861 }
859 862
860 } // namespace proxy 863 } // namespace proxy
861 } // namespace ppapi 864 } // namespace ppapi
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698