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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 #include "content/public/common/url_utils.h" 119 #include "content/public/common/url_utils.h"
120 #include "content/public/common/web_preferences.h" 120 #include "content/public/common/web_preferences.h"
121 #include "device/geolocation/geolocation_service_context.h" 121 #include "device/geolocation/geolocation_service_context.h"
122 #include "device/nfc/nfc.mojom.h" 122 #include "device/nfc/nfc.mojom.h"
123 #include "device/wake_lock/wake_lock_service_context.h" 123 #include "device/wake_lock/wake_lock_service_context.h"
124 #include "net/base/url_util.h" 124 #include "net/base/url_util.h"
125 #include "net/http/http_cache.h" 125 #include "net/http/http_cache.h"
126 #include "net/http/http_transaction_factory.h" 126 #include "net/http/http_transaction_factory.h"
127 #include "net/url_request/url_request_context.h" 127 #include "net/url_request/url_request_context.h"
128 #include "net/url_request/url_request_context_getter.h" 128 #include "net/url_request/url_request_context_getter.h"
129 #include "services/shell/public/cpp/interface_provider.h" 129 #include "services/service_manager/public/cpp/interface_provider.h"
130 #include "third_party/WebKit/public/platform/WebSecurityStyle.h" 130 #include "third_party/WebKit/public/platform/WebSecurityStyle.h"
131 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 131 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
132 #include "third_party/skia/include/core/SkBitmap.h" 132 #include "third_party/skia/include/core/SkBitmap.h"
133 #include "ui/accessibility/ax_tree_combiner.h" 133 #include "ui/accessibility/ax_tree_combiner.h"
134 #include "ui/base/layout.h" 134 #include "ui/base/layout.h"
135 #include "ui/events/blink/web_input_event_traits.h" 135 #include "ui/events/blink/web_input_event_traits.h"
136 #include "ui/gl/gl_switches.h" 136 #include "ui/gl/gl_switches.h"
137 137
138 #if defined(OS_ANDROID) 138 #if defined(OS_ANDROID)
139 #include "content/browser/android/content_video_view.h" 139 #include "content/browser/android/content_video_view.h"
(...skipping 5047 matching lines...) Expand 10 before | Expand all | Expand 10 after
5187 dialog_manager_ = dialog_manager; 5187 dialog_manager_ = dialog_manager;
5188 } 5188 }
5189 5189
5190 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { 5190 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
5191 auto it = binding_sets_.find(interface_name); 5191 auto it = binding_sets_.find(interface_name);
5192 if (it != binding_sets_.end()) 5192 if (it != binding_sets_.end())
5193 binding_sets_.erase(it); 5193 binding_sets_.erase(it);
5194 } 5194 }
5195 5195
5196 } // namespace content 5196 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/vibration_browsertest.cc ('k') | content/browser/websockets/websocket_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698