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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/renderer/chrome_content_renderer_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/renderer/DEPS ('k') | chrome/renderer/extensions/app_window_custom_bindings.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/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
22 #include "chrome/common/content_settings_pattern.h" 22 #include "chrome/common/content_settings_pattern.h"
23 #include "chrome/common/crash_keys.h" 23 #include "chrome/common/crash_keys.h"
24 #include "chrome/common/extensions/chrome_extensions_client.h" 24 #include "chrome/common/extensions/chrome_extensions_client.h"
25 #include "chrome/common/extensions/extension_constants.h" 25 #include "chrome/common/extensions/extension_constants.h"
26 #include "chrome/common/extensions/extension_process_policy.h" 26 #include "chrome/common/extensions/extension_process_policy.h"
27 #include "chrome/common/localized_error.h" 27 #include "chrome/common/localized_error.h"
28 #include "chrome/common/pepper_permission_util.h" 28 #include "chrome/common/pepper_permission_util.h"
29 #include "chrome/common/render_messages.h" 29 #include "chrome/common/render_messages.h"
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "chrome/grit/generated_resources.h"
32 #include "chrome/grit/locale_settings.h"
33 #include "chrome/grit/renderer_resources.h"
31 #include "chrome/renderer/benchmarking_extension.h" 34 #include "chrome/renderer/benchmarking_extension.h"
32 #include "chrome/renderer/chrome_render_frame_observer.h" 35 #include "chrome/renderer/chrome_render_frame_observer.h"
33 #include "chrome/renderer/chrome_render_process_observer.h" 36 #include "chrome/renderer/chrome_render_process_observer.h"
34 #include "chrome/renderer/chrome_render_view_observer.h" 37 #include "chrome/renderer/chrome_render_view_observer.h"
35 #include "chrome/renderer/content_settings_observer.h" 38 #include "chrome/renderer/content_settings_observer.h"
36 #include "chrome/renderer/extensions/chrome_extension_helper.h" 39 #include "chrome/renderer/extensions/chrome_extension_helper.h"
37 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h" 40 #include "chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.h"
38 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h" 41 #include "chrome/renderer/extensions/chrome_extensions_renderer_client.h"
39 #include "chrome/renderer/extensions/extension_frame_helper.h" 42 #include "chrome/renderer/extensions/extension_frame_helper.h"
40 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" 43 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 #include "content/public/renderer/render_view.h" 84 #include "content/public/renderer/render_view.h"
82 #include "content/public/renderer/render_view_visitor.h" 85 #include "content/public/renderer/render_view_visitor.h"
83 #include "extensions/common/constants.h" 86 #include "extensions/common/constants.h"
84 #include "extensions/common/extension.h" 87 #include "extensions/common/extension.h"
85 #include "extensions/common/extension_set.h" 88 #include "extensions/common/extension_set.h"
86 #include "extensions/common/extension_urls.h" 89 #include "extensions/common/extension_urls.h"
87 #include "extensions/common/switches.h" 90 #include "extensions/common/switches.h"
88 #include "extensions/renderer/dispatcher.h" 91 #include "extensions/renderer/dispatcher.h"
89 #include "extensions/renderer/extension_helper.h" 92 #include "extensions/renderer/extension_helper.h"
90 #include "extensions/renderer/script_context.h" 93 #include "extensions/renderer/script_context.h"
91 #include "grit/generated_resources.h"
92 #include "grit/locale_settings.h"
93 #include "grit/renderer_resources.h"
94 #include "ipc/ipc_sync_channel.h" 94 #include "ipc/ipc_sync_channel.h"
95 #include "net/base/net_errors.h" 95 #include "net/base/net_errors.h"
96 #include "ppapi/c/private/ppb_nacl_private.h" 96 #include "ppapi/c/private/ppb_nacl_private.h"
97 #include "ppapi/c/private/ppb_pdf.h" 97 #include "ppapi/c/private/ppb_pdf.h"
98 #include "ppapi/shared_impl/ppapi_switches.h" 98 #include "ppapi/shared_impl/ppapi_switches.h"
99 #include "third_party/WebKit/public/platform/WebURL.h" 99 #include "third_party/WebKit/public/platform/WebURL.h"
100 #include "third_party/WebKit/public/platform/WebURLError.h" 100 #include "third_party/WebKit/public/platform/WebURLError.h"
101 #include "third_party/WebKit/public/platform/WebURLRequest.h" 101 #include "third_party/WebKit/public/platform/WebURLRequest.h"
102 #include "third_party/WebKit/public/web/WebCache.h" 102 #include "third_party/WebKit/public/web/WebCache.h"
103 #include "third_party/WebKit/public/web/WebDataSource.h" 103 #include "third_party/WebKit/public/web/WebDataSource.h"
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1501 1501
1502 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_)) 1502 if (IsExtensionOrSharedModuleWhitelisted(url, allowed_video_decode_origins_))
1503 return true; 1503 return true;
1504 1504
1505 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); 1505 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
1506 return channel <= chrome::VersionInfo::CHANNEL_DEV; 1506 return channel <= chrome::VersionInfo::CHANNEL_DEV;
1507 #else 1507 #else
1508 return false; 1508 return false;
1509 #endif 1509 #endif
1510 } 1510 }
OLDNEW
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/extensions/app_window_custom_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698