chrome/common/chrome_content_client.cc - Issue 15957008: Move NaCl related switches to their own file.

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 15957008: Move NaCl related switches to their own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/chrome_switches.h » ('j') | chrome/nacl/nacl_switches.cc » ('J')

OLD	NEW
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 "chrome/common/chrome_content_client.h"	5 #include "chrome/common/chrome_content_client.h"

6	6

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

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

9 #include "base/file_util.h"	9 #include "base/file_util.h"

10 #include "base/path_service.h"	10 #include "base/path_service.h"

11 #include "base/process_util.h"	11 #include "base/process_util.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

13 #include "base/stringprintf.h"	13 #include "base/stringprintf.h"

14 #include "base/strings/string_number_conversions.h"	14 #include "base/strings/string_number_conversions.h"

15 #include "base/strings/string_split.h"	15 #include "base/strings/string_split.h"

16 #include "base/utf_string_conversions.h"	16 #include "base/utf_string_conversions.h"

17 #include "build/build_config.h"	17 #include "build/build_config.h"

18 #include "chrome/common/child_process_logging.h"	18 #include "chrome/common/child_process_logging.h"

19 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

20 #include "chrome/common/chrome_process_type.h"	20 #include "chrome/common/chrome_process_type.h"

21 #include "chrome/common/chrome_switches.h"

22 #include "chrome/common/chrome_version_info.h"	21 #include "chrome/common/chrome_version_info.h"

23 #include "chrome/common/pepper_flash.h"	22 #include "chrome/common/pepper_flash.h"

24 #include "chrome/common/render_messages.h"	23 #include "chrome/common/render_messages.h"

25 #include "chrome/common/url_constants.h"	24 #include "chrome/common/url_constants.h"

	25 #include "chrome/nacl/nacl_switches.h"

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

27 #include "content/public/common/pepper_plugin_info.h"	27 #include "content/public/common/pepper_plugin_info.h"

28 #include "content/public/common/url_constants.h"	28 #include "content/public/common/url_constants.h"

29 #include "extensions/common/constants.h"	29 #include "extensions/common/constants.h"

30 #include "grit/common_resources.h"	30 #include "grit/common_resources.h"

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

32 #include "remoting/client/plugin/pepper_entrypoints.h"	32 #include "remoting/client/plugin/pepper_entrypoints.h"

33 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

34 #include "ui/base/layout.h"	34 #include "ui/base/layout.h"

35 #include "ui/base/resource/resource_bundle.h"	35 #include "ui/base/resource/resource_bundle.h"

(...skipping 447 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
483 }	483 }

484 return false;	484 return false;

485 }	485 }

486	486

487 std::string ChromeContentClient::GetCarbonInterposePath() const {	487 std::string ChromeContentClient::GetCarbonInterposePath() const {

488 return std::string(kInterposeLibraryPath);	488 return std::string(kInterposeLibraryPath);

489 }	489 }

490 #endif	490 #endif

491	491

492 } // namespace chrome	492 } // namespace chrome

OLD	NEW