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

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

Issue 505893002: Revert of Move core web_view code to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | chrome/browser/extensions/api/chrome_extensions_api_client.h » ('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/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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 #include "components/nacl/browser/nacl_host_message_filter.h" 214 #include "components/nacl/browser/nacl_host_message_filter.h"
215 #include "components/nacl/browser/nacl_process_host.h" 215 #include "components/nacl/browser/nacl_process_host.h"
216 #include "components/nacl/common/nacl_process_type.h" 216 #include "components/nacl/common/nacl_process_type.h"
217 #include "components/nacl/common/nacl_switches.h" 217 #include "components/nacl/common/nacl_switches.h"
218 #endif 218 #endif
219 219
220 #if defined(ENABLE_EXTENSIONS) 220 #if defined(ENABLE_EXTENSIONS)
221 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h" 221 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h"
222 #include "chrome/browser/extensions/extension_service.h" 222 #include "chrome/browser/extensions/extension_service.h"
223 #include "chrome/browser/extensions/extension_util.h" 223 #include "chrome/browser/extensions/extension_util.h"
224 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
225 #include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"
226 #include "chrome/browser/guest_view/web_view/web_view_renderer_state.h"
224 #include "extensions/browser/guest_view/guest_view_base.h" 227 #include "extensions/browser/guest_view/guest_view_base.h"
225 #include "extensions/browser/guest_view/guest_view_constants.h" 228 #include "extensions/browser/guest_view/guest_view_constants.h"
226 #include "extensions/browser/guest_view/guest_view_manager.h" 229 #include "extensions/browser/guest_view/guest_view_manager.h"
227 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
228 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
229 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
230 #include "extensions/browser/suggest_permission_util.h" 230 #include "extensions/browser/suggest_permission_util.h"
231 #include "extensions/common/manifest_handlers/background_info.h" 231 #include "extensions/common/manifest_handlers/background_info.h"
232 #endif 232 #endif
233 233
234 #if defined(ENABLE_SPELLCHECK) 234 #if defined(ENABLE_SPELLCHECK)
235 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 235 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
236 #endif 236 #endif
237 237
238 #if defined(ENABLE_SERVICE_DISCOVERY) 238 #if defined(ENABLE_SERVICE_DISCOVERY)
239 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h" 239 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
(...skipping 2345 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 switches::kDisableWebRtcEncryption, 2585 switches::kDisableWebRtcEncryption,
2586 }; 2586 };
2587 to_command_line->CopySwitchesFrom(from_command_line, 2587 to_command_line->CopySwitchesFrom(from_command_line,
2588 kWebRtcDevSwitchNames, 2588 kWebRtcDevSwitchNames,
2589 arraysize(kWebRtcDevSwitchNames)); 2589 arraysize(kWebRtcDevSwitchNames));
2590 } 2590 }
2591 } 2591 }
2592 #endif // defined(ENABLE_WEBRTC) 2592 #endif // defined(ENABLE_WEBRTC)
2593 2593
2594 } // namespace chrome 2594 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/chrome_extensions_api_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698