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

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

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove webkit strings that no longer exist Created 6 years, 4 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/common/attrition_experiments.h ('k') | chrome/common/chrome_version_info.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) 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/debug/crash_logging.h" 9 #include "base/debug/crash_logging.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "chrome/common/child_process_logging.h" 19 #include "chrome/common/child_process_logging.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/chrome_version_info.h" 22 #include "chrome/common/chrome_version_info.h"
23 #include "chrome/common/crash_keys.h" 23 #include "chrome/common/crash_keys.h"
24 #include "chrome/common/pepper_flash.h" 24 #include "chrome/common/pepper_flash.h"
25 #include "chrome/common/render_messages.h" 25 #include "chrome/common/render_messages.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/grit/common_resources.h"
27 #include "components/dom_distiller/core/url_constants.h" 28 #include "components/dom_distiller/core/url_constants.h"
28 #include "components/nacl/common/nacl_process_type.h" 29 #include "components/nacl/common/nacl_process_type.h"
29 #include "content/public/common/content_constants.h" 30 #include "content/public/common/content_constants.h"
30 #include "content/public/common/content_switches.h" 31 #include "content/public/common/content_switches.h"
31 #include "content/public/common/pepper_plugin_info.h" 32 #include "content/public/common/pepper_plugin_info.h"
32 #include "content/public/common/url_constants.h" 33 #include "content/public/common/url_constants.h"
33 #include "content/public/common/user_agent.h" 34 #include "content/public/common/user_agent.h"
34 #include "extensions/common/constants.h" 35 #include "extensions/common/constants.h"
35 #include "gpu/config/gpu_info.h" 36 #include "gpu/config/gpu_info.h"
36 #include "grit/common_resources.h"
37 #include "ppapi/shared_impl/ppapi_permissions.h" 37 #include "ppapi/shared_impl/ppapi_permissions.h"
38 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
39 #include "ui/base/layout.h" 39 #include "ui/base/layout.h"
40 #include "ui/base/resource/resource_bundle.h" 40 #include "ui/base/resource/resource_bundle.h"
41 41
42 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 42 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR.
43 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 43 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
44 44
45 #if defined(OS_WIN) 45 #if defined(OS_WIN)
46 #include "base/win/registry.h" 46 #include "base/win/registry.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 int sandbox_type, 538 int sandbox_type,
539 int* sandbox_profile_resource_id) const { 539 int* sandbox_profile_resource_id) const {
540 DCHECK(sandbox_profile_resource_id); 540 DCHECK(sandbox_profile_resource_id);
541 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { 541 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
542 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; 542 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
543 return true; 543 return true;
544 } 544 }
545 return false; 545 return false;
546 } 546 }
547 #endif 547 #endif
OLDNEW
« no previous file with comments | « chrome/common/attrition_experiments.h ('k') | chrome/common/chrome_version_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698