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

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

Issue 577453002: Rename ChromeBrowserPluginDelegate to GuestViewContainer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved GuestViewContainer to ENABLE_EXTENSIONS guard 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/chrome_renderer.gypi » ('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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 #include "components/nacl/common/nacl_switches.h" 210 #include "components/nacl/common/nacl_switches.h"
211 #endif 211 #endif
212 212
213 #if defined(ENABLE_EXTENSIONS) 213 #if defined(ENABLE_EXTENSIONS)
214 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h" 214 #include "chrome/browser/extensions/chrome_content_browser_client_extensions_par t.h"
215 #include "chrome/browser/extensions/extension_service.h" 215 #include "chrome/browser/extensions/extension_service.h"
216 #include "chrome/browser/extensions/extension_util.h" 216 #include "chrome/browser/extensions/extension_util.h"
217 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h" 217 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
218 #include "extensions/browser/extension_system.h" 218 #include "extensions/browser/extension_system.h"
219 #include "extensions/browser/guest_view/guest_view_base.h" 219 #include "extensions/browser/guest_view/guest_view_base.h"
220 #include "extensions/browser/guest_view/guest_view_constants.h"
221 #include "extensions/browser/guest_view/guest_view_manager.h" 220 #include "extensions/browser/guest_view/guest_view_manager.h"
222 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 221 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
223 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" 222 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
224 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h" 223 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
225 #include "extensions/browser/suggest_permission_util.h" 224 #include "extensions/browser/suggest_permission_util.h"
226 #include "extensions/common/constants.h" 225 #include "extensions/common/constants.h"
227 #include "extensions/common/extension.h" 226 #include "extensions/common/extension.h"
228 #include "extensions/common/extension_set.h" 227 #include "extensions/common/extension_set.h"
229 #include "extensions/common/manifest_handlers/background_info.h" 228 #include "extensions/common/manifest_handlers/background_info.h"
230 #include "extensions/common/manifest_handlers/shared_module_info.h" 229 #include "extensions/common/manifest_handlers/shared_module_info.h"
(...skipping 2361 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 switches::kDisableWebRtcEncryption, 2591 switches::kDisableWebRtcEncryption,
2593 }; 2592 };
2594 to_command_line->CopySwitchesFrom(from_command_line, 2593 to_command_line->CopySwitchesFrom(from_command_line,
2595 kWebRtcDevSwitchNames, 2594 kWebRtcDevSwitchNames,
2596 arraysize(kWebRtcDevSwitchNames)); 2595 arraysize(kWebRtcDevSwitchNames));
2597 } 2596 }
2598 } 2597 }
2599 #endif // defined(ENABLE_WEBRTC) 2598 #endif // defined(ENABLE_WEBRTC)
2600 2599
2601 } // namespace chrome 2600 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698