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

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

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 #include "content/public/common/web_preferences.h" 120 #include "content/public/common/web_preferences.h"
121 #include "extensions/browser/extension_system.h" 121 #include "extensions/browser/extension_system.h"
122 #include "extensions/common/constants.h" 122 #include "extensions/common/constants.h"
123 #include "extensions/common/extension.h" 123 #include "extensions/common/extension.h"
124 #include "extensions/common/extension_set.h" 124 #include "extensions/common/extension_set.h"
125 #include "extensions/common/manifest_handlers/shared_module_info.h" 125 #include "extensions/common/manifest_handlers/shared_module_info.h"
126 #include "extensions/common/permissions/permissions_data.h" 126 #include "extensions/common/permissions/permissions_data.h"
127 #include "extensions/common/permissions/socket_permission.h" 127 #include "extensions/common/permissions/socket_permission.h"
128 #include "extensions/common/switches.h" 128 #include "extensions/common/switches.h"
129 #include "grit/generated_resources.h" 129 #include "grit/generated_resources.h"
130 #include "grit/ui_resources.h"
131 #include "net/base/mime_util.h" 130 #include "net/base/mime_util.h"
132 #include "net/cookies/canonical_cookie.h" 131 #include "net/cookies/canonical_cookie.h"
133 #include "net/cookies/cookie_options.h" 132 #include "net/cookies/cookie_options.h"
134 #include "net/ssl/ssl_cert_request_info.h" 133 #include "net/ssl/ssl_cert_request_info.h"
135 #include "ppapi/host/ppapi_host.h" 134 #include "ppapi/host/ppapi_host.h"
136 #include "ppapi/shared_impl/ppapi_switches.h" 135 #include "ppapi/shared_impl/ppapi_switches.h"
137 #include "ui/base/l10n/l10n_util.h" 136 #include "ui/base/l10n/l10n_util.h"
138 #include "ui/base/resource/resource_bundle.h" 137 #include "ui/base/resource/resource_bundle.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"
140 140
141 #if defined(OS_WIN) 141 #if defined(OS_WIN)
142 #include "base/win/windows_version.h" 142 #include "base/win/windows_version.h"
143 #include "chrome/browser/chrome_browser_main_win.h" 143 #include "chrome/browser/chrome_browser_main_win.h"
144 #include "sandbox/win/src/sandbox_policy.h" 144 #include "sandbox/win/src/sandbox_policy.h"
145 #elif defined(OS_MACOSX) 145 #elif defined(OS_MACOSX)
146 #include "chrome/browser/chrome_browser_main_mac.h" 146 #include "chrome/browser/chrome_browser_main_mac.h"
147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 147 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
148 #include "components/breakpad/app/breakpad_mac.h" 148 #include "components/breakpad/app/breakpad_mac.h"
(...skipping 2465 matching lines...) Expand 10 before | Expand all | Expand 10 after
2614 switches::kDisableWebRtcEncryption, 2614 switches::kDisableWebRtcEncryption,
2615 }; 2615 };
2616 to_command_line->CopySwitchesFrom(from_command_line, 2616 to_command_line->CopySwitchesFrom(from_command_line,
2617 kWebRtcDevSwitchNames, 2617 kWebRtcDevSwitchNames,
2618 arraysize(kWebRtcDevSwitchNames)); 2618 arraysize(kWebRtcDevSwitchNames));
2619 } 2619 }
2620 } 2620 }
2621 #endif // defined(ENABLE_WEBRTC) 2621 #endif // defined(ENABLE_WEBRTC)
2622 2622
2623 } // namespace chrome 2623 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/cookies_tree_model.cc ('k') | chrome/browser/custom_home_pages_table_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698