OLD | NEW |
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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 #include "content/browser/media/android/media_web_contents_observer_android.h" | 141 #include "content/browser/media/android/media_web_contents_observer_android.h" |
142 #include "content/browser/web_contents/web_contents_android.h" | 142 #include "content/browser/web_contents/web_contents_android.h" |
143 #endif // OS_ANDROID | 143 #endif // OS_ANDROID |
144 | 144 |
145 #if defined(OS_MACOSX) | 145 #if defined(OS_MACOSX) |
146 #include "base/mac/foundation_util.h" | 146 #include "base/mac/foundation_util.h" |
147 #endif | 147 #endif |
148 | 148 |
149 #if defined(USE_AURA) | 149 #if defined(USE_AURA) |
150 #include "content/browser/web_contents/web_contents_view_mus.h" | 150 #include "content/browser/web_contents/web_contents_view_mus.h" |
151 #include "content/public/common/mojo_shell_connection.h" | 151 #include "content/public/common/service_manager_connection.h" |
152 #include "ui/aura/mus/mus_util.h" | 152 #include "ui/aura/mus/mus_util.h" |
153 #endif | 153 #endif |
154 | 154 |
155 #if defined(ENABLE_PLUGINS) | 155 #if defined(ENABLE_PLUGINS) |
156 #include "content/browser/media/session/pepper_playback_observer.h" | 156 #include "content/browser/media/session/pepper_playback_observer.h" |
157 #endif // ENABLE_PLUGINS | 157 #endif // ENABLE_PLUGINS |
158 | 158 |
159 namespace content { | 159 namespace content { |
160 namespace { | 160 namespace { |
161 | 161 |
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1574 | 1574 |
1575 // blink::FrameTree::setName always keeps |unique_name| empty in case of a | 1575 // blink::FrameTree::setName always keeps |unique_name| empty in case of a |
1576 // main frame - let's do the same thing here. | 1576 // main frame - let's do the same thing here. |
1577 std::string unique_name; | 1577 std::string unique_name; |
1578 frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); | 1578 frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); |
1579 | 1579 |
1580 WebContentsViewDelegate* delegate = | 1580 WebContentsViewDelegate* delegate = |
1581 GetContentClient()->browser()->GetWebContentsViewDelegate(this); | 1581 GetContentClient()->browser()->GetWebContentsViewDelegate(this); |
1582 | 1582 |
1583 #if defined(USE_AURA) | 1583 #if defined(USE_AURA) |
1584 if (MojoShellConnection::GetForProcess() && | 1584 if (ServiceManagerConnection::GetForProcess() && |
1585 base::CommandLine::ForCurrentProcess()->HasSwitch( | 1585 base::CommandLine::ForCurrentProcess()->HasSwitch( |
1586 switches::kUseMusInRenderer)) { | 1586 switches::kUseMusInRenderer)) { |
1587 ui::Window* mus_window = aura::GetMusWindow(params.context); | 1587 ui::Window* mus_window = aura::GetMusWindow(params.context); |
1588 if (mus_window) { | 1588 if (mus_window) { |
1589 view_.reset(new WebContentsViewMus(mus_window, this, delegate, | 1589 view_.reset(new WebContentsViewMus(mus_window, this, delegate, |
1590 &render_view_host_delegate_view_)); | 1590 &render_view_host_delegate_view_)); |
1591 } | 1591 } |
1592 } | 1592 } |
1593 #endif | 1593 #endif |
1594 | 1594 |
(...skipping 3677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5272 dialog_manager_ = dialog_manager; | 5272 dialog_manager_ = dialog_manager; |
5273 } | 5273 } |
5274 | 5274 |
5275 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { | 5275 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { |
5276 auto it = binding_sets_.find(interface_name); | 5276 auto it = binding_sets_.find(interface_name); |
5277 if (it != binding_sets_.end()) | 5277 if (it != binding_sets_.end()) |
5278 binding_sets_.erase(it); | 5278 binding_sets_.erase(it); |
5279 } | 5279 } |
5280 | 5280 |
5281 } // namespace content | 5281 } // namespace content |
OLD | NEW |