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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "chrome/common/chrome_constants.h" 82 #include "chrome/common/chrome_constants.h"
83 #include "chrome/common/chrome_paths.h" 83 #include "chrome/common/chrome_paths.h"
84 #include "chrome/common/chrome_switches.h" 84 #include "chrome/common/chrome_switches.h"
85 #include "chrome/common/content_settings.h" 85 #include "chrome/common/content_settings.h"
86 #include "chrome/common/env_vars.h" 86 #include "chrome/common/env_vars.h"
87 #include "chrome/common/logging_chrome.h" 87 #include "chrome/common/logging_chrome.h"
88 #include "chrome/common/pepper_permission_util.h" 88 #include "chrome/common/pepper_permission_util.h"
89 #include "chrome/common/pref_names.h" 89 #include "chrome/common/pref_names.h"
90 #include "chrome/common/render_messages.h" 90 #include "chrome/common/render_messages.h"
91 #include "chrome/common/url_constants.h" 91 #include "chrome/common/url_constants.h"
92 #include "chrome/grit/generated_resources.h"
92 #include "chrome/installer/util/google_update_settings.h" 93 #include "chrome/installer/util/google_update_settings.h"
93 #include "chromeos/chromeos_constants.h" 94 #include "chromeos/chromeos_constants.h"
94 #include "components/cdm/browser/cdm_message_filter_android.h" 95 #include "components/cdm/browser/cdm_message_filter_android.h"
95 #include "components/cloud_devices/common/cloud_devices_switches.h" 96 #include "components/cloud_devices/common/cloud_devices_switches.h"
96 #include "components/dom_distiller/core/url_constants.h" 97 #include "components/dom_distiller/core/url_constants.h"
97 #include "components/google/core/browser/google_util.h" 98 #include "components/google/core/browser/google_util.h"
98 #include "components/metrics/client_info.h" 99 #include "components/metrics/client_info.h"
99 #include "components/pref_registry/pref_registry_syncable.h" 100 #include "components/pref_registry/pref_registry_syncable.h"
100 #include "components/signin/core/common/profile_management_switches.h" 101 #include "components/signin/core/common/profile_management_switches.h"
101 #include "components/translate/core/common/translate_switches.h" 102 #include "components/translate/core/common/translate_switches.h"
(...skipping 17 matching lines...) Expand all
119 #include "content/public/common/url_utils.h" 120 #include "content/public/common/url_utils.h"
120 #include "content/public/common/web_preferences.h" 121 #include "content/public/common/web_preferences.h"
121 #include "extensions/browser/extension_system.h" 122 #include "extensions/browser/extension_system.h"
122 #include "extensions/common/constants.h" 123 #include "extensions/common/constants.h"
123 #include "extensions/common/extension.h" 124 #include "extensions/common/extension.h"
124 #include "extensions/common/extension_set.h" 125 #include "extensions/common/extension_set.h"
125 #include "extensions/common/manifest_handlers/shared_module_info.h" 126 #include "extensions/common/manifest_handlers/shared_module_info.h"
126 #include "extensions/common/permissions/permissions_data.h" 127 #include "extensions/common/permissions/permissions_data.h"
127 #include "extensions/common/permissions/socket_permission.h" 128 #include "extensions/common/permissions/socket_permission.h"
128 #include "extensions/common/switches.h" 129 #include "extensions/common/switches.h"
129 #include "grit/generated_resources.h"
130 #include "net/base/mime_util.h" 130 #include "net/base/mime_util.h"
131 #include "net/cookies/canonical_cookie.h" 131 #include "net/cookies/canonical_cookie.h"
132 #include "net/cookies/cookie_options.h" 132 #include "net/cookies/cookie_options.h"
133 #include "net/ssl/ssl_cert_request_info.h" 133 #include "net/ssl/ssl_cert_request_info.h"
134 #include "ppapi/host/ppapi_host.h" 134 #include "ppapi/host/ppapi_host.h"
135 #include "ppapi/shared_impl/ppapi_switches.h" 135 #include "ppapi/shared_impl/ppapi_switches.h"
136 #include "ui/base/l10n/l10n_util.h" 136 #include "ui/base/l10n/l10n_util.h"
137 #include "ui/base/resource/resource_bundle.h" 137 #include "ui/base/resource/resource_bundle.h"
138 #include "ui/resources/grit/ui_resources.h" 138 #include "ui/resources/grit/ui_resources.h"
139 #include "webkit/browser/fileapi/external_mount_points.h" 139 #include "webkit/browser/fileapi/external_mount_points.h"
(...skipping 2476 matching lines...) Expand 10 before | Expand all | Expand 10 after
2616 switches::kDisableWebRtcEncryption, 2616 switches::kDisableWebRtcEncryption,
2617 }; 2617 };
2618 to_command_line->CopySwitchesFrom(from_command_line, 2618 to_command_line->CopySwitchesFrom(from_command_line,
2619 kWebRtcDevSwitchNames, 2619 kWebRtcDevSwitchNames,
2620 arraysize(kWebRtcDevSwitchNames)); 2620 arraysize(kWebRtcDevSwitchNames));
2621 } 2621 }
2622 } 2622 }
2623 #endif // defined(ENABLE_WEBRTC) 2623 #endif // defined(ENABLE_WEBRTC)
2624 2624
2625 } // namespace chrome 2625 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/chrome_quota_permission_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698