components/nacl/renderer/nexe_load_manager.cc - Issue 322403005: Pepper: Remove nacl_entry_points.h.

Side by Side Diff: components/nacl/renderer/nexe_load_manager.cc

Issue 322403005: Pepper: Remove nacl_entry_points.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« no previous file with comments | « components/nacl/renderer/DEPS ('k') | components/nacl/renderer/ppb_nacl_private_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "components/nacl/renderer/nexe_load_manager.h"	5 #include "components/nacl/renderer/nexe_load_manager.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/metrics/histogram.h"	9 #include "base/metrics/histogram.h"

10 #include "base/strings/string_tokenizer.h"	10 #include "base/strings/string_tokenizer.h"

11 #include "base/strings/string_util.h"	11 #include "base/strings/string_util.h"

12 #include "components/nacl/common/nacl_host_messages.h"	12 #include "components/nacl/common/nacl_host_messages.h"

13 #include "components/nacl/common/nacl_types.h"	13 #include "components/nacl/common/nacl_types.h"

14 #include "components/nacl/renderer/histogram.h"	14 #include "components/nacl/renderer/histogram.h"

15 #include "components/nacl/renderer/manifest_service_channel.h"	15 #include "components/nacl/renderer/manifest_service_channel.h"

16 #include "components/nacl/renderer/pnacl_translation_resource_host.h"	16 #include "components/nacl/renderer/pnacl_translation_resource_host.h"

17 #include "components/nacl/renderer/progress_event.h"	17 #include "components/nacl/renderer/progress_event.h"

18 #include "components/nacl/renderer/sandbox_arch.h"	18 #include "components/nacl/renderer/sandbox_arch.h"

19 #include "components/nacl/renderer/trusted_plugin_channel.h"	19 #include "components/nacl/renderer/trusted_plugin_channel.h"

20 #include "content/public/common/content_client.h"	20 #include "content/public/common/content_client.h"

21 #include "content/public/common/content_switches.h"	21 #include "content/public/common/content_switches.h"

22 #include "content/public/common/sandbox_init.h"	22 #include "content/public/common/sandbox_init.h"

23 #include "content/public/renderer/pepper_plugin_instance.h"	23 #include "content/public/renderer/pepper_plugin_instance.h"

24 #include "content/public/renderer/render_thread.h"	24 #include "content/public/renderer/render_thread.h"

25 #include "content/public/renderer/render_view.h"	25 #include "content/public/renderer/render_view.h"

26 #include "content/public/renderer/renderer_ppapi_host.h"	26 #include "content/public/renderer/renderer_ppapi_host.h"

27 #include "ppapi/c/pp_bool.h"	27 #include "ppapi/c/pp_bool.h"

28 #include "ppapi/c/private/pp_file_handle.h"	28 #include "ppapi/c/private/pp_file_handle.h"

29 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"

30 #include "ppapi/shared_impl/ppapi_globals.h"	29 #include "ppapi/shared_impl/ppapi_globals.h"

31 #include "ppapi/shared_impl/ppapi_permissions.h"	30 #include "ppapi/shared_impl/ppapi_permissions.h"

32 #include "ppapi/shared_impl/ppapi_preferences.h"	31 #include "ppapi/shared_impl/ppapi_preferences.h"

33 #include "ppapi/shared_impl/scoped_pp_var.h"	32 #include "ppapi/shared_impl/scoped_pp_var.h"

34 #include "ppapi/shared_impl/var.h"	33 #include "ppapi/shared_impl/var.h"

35 #include "ppapi/shared_impl/var_tracker.h"	34 #include "ppapi/shared_impl/var_tracker.h"

36 #include "ppapi/thunk/enter.h"	35 #include "ppapi/thunk/enter.h"

37 #include "third_party/WebKit/public/web/WebDocument.h"	36 #include "third_party/WebKit/public/web/WebDocument.h"

38 #include "third_party/WebKit/public/web/WebElement.h"	37 #include "third_party/WebKit/public/web/WebElement.h"

39 #include "third_party/WebKit/public/web/WebPluginContainer.h"	38 #include "third_party/WebKit/public/web/WebPluginContainer.h"

(...skipping 377 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
417 // to provide error handling.	416 // to provide error handling.

418 }	417 }

419	418

420 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) {	419 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) {

421 base::StringTokenizer t(crash_log, "\n");	420 base::StringTokenizer t(crash_log, "\n");

422 while (t.GetNext())	421 while (t.GetNext())

423 LogToConsole(t.token());	422 LogToConsole(t.token());

424 }	423 }

425	424

426 } // namespace nacl	425 } // namespace nacl

OLD	NEW