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

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

Issue 327363002: Remove adview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 #if defined(USE_X11) 220 #if defined(USE_X11)
221 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" 221 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h"
222 #endif 222 #endif
223 223
224 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 224 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
225 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 225 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
226 #endif 226 #endif
227 227
228 #if defined(ENABLE_EXTENSIONS) 228 #if defined(ENABLE_EXTENSIONS)
229 #include "chrome/browser/guest_view/ad_view/ad_view_guest.h"
230 #include "chrome/browser/guest_view/guest_view_base.h" 229 #include "chrome/browser/guest_view/guest_view_base.h"
231 #include "chrome/browser/guest_view/guest_view_constants.h" 230 #include "chrome/browser/guest_view/guest_view_constants.h"
232 #include "chrome/browser/guest_view/guest_view_manager.h" 231 #include "chrome/browser/guest_view/guest_view_manager.h"
233 #include "chrome/browser/guest_view/web_view/web_view_guest.h" 232 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
234 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h" 233 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
235 #endif 234 #endif
236 235
237 #if defined(ENABLE_SPELLCHECK) 236 #if defined(ENABLE_SPELLCHECK)
238 #include "chrome/browser/spellchecker/spellcheck_message_filter.h" 237 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
239 #endif 238 #endif
(...skipping 2540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2780 switches::kDisableWebRtcEncryption, 2779 switches::kDisableWebRtcEncryption,
2781 }; 2780 };
2782 to_command_line->CopySwitchesFrom(from_command_line, 2781 to_command_line->CopySwitchesFrom(from_command_line,
2783 kWebRtcDevSwitchNames, 2782 kWebRtcDevSwitchNames,
2784 arraysize(kWebRtcDevSwitchNames)); 2783 arraysize(kWebRtcDevSwitchNames));
2785 } 2784 }
2786 } 2785 }
2787 #endif // defined(ENABLE_WEBRTC) 2786 #endif // defined(ENABLE_WEBRTC)
2788 2787
2789 } // namespace chrome 2788 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698