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

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

Issue 2374863002: Remove usage of HostZoomMap from c/b/loader via ReadyToCommitNavigation (Closed)
Patch Set: init Created 4 years, 1 month 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 | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/BUILD.gn » ('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 "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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "content/browser/frame_host/cross_process_frame_connector.h" 47 #include "content/browser/frame_host/cross_process_frame_connector.h"
48 #include "content/browser/frame_host/frame_tree_node.h" 48 #include "content/browser/frame_host/frame_tree_node.h"
49 #include "content/browser/frame_host/interstitial_page_impl.h" 49 #include "content/browser/frame_host/interstitial_page_impl.h"
50 #include "content/browser/frame_host/navigation_entry_impl.h" 50 #include "content/browser/frame_host/navigation_entry_impl.h"
51 #include "content/browser/frame_host/navigation_handle_impl.h" 51 #include "content/browser/frame_host/navigation_handle_impl.h"
52 #include "content/browser/frame_host/navigator_impl.h" 52 #include "content/browser/frame_host/navigator_impl.h"
53 #include "content/browser/frame_host/render_frame_host_impl.h" 53 #include "content/browser/frame_host/render_frame_host_impl.h"
54 #include "content/browser/frame_host/render_frame_proxy_host.h" 54 #include "content/browser/frame_host/render_frame_proxy_host.h"
55 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 55 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
56 #include "content/browser/host_zoom_map_impl.h" 56 #include "content/browser/host_zoom_map_impl.h"
57 #include "content/browser/host_zoom_map_observer.h"
57 #include "content/browser/loader/loader_io_thread_notifier.h" 58 #include "content/browser/loader/loader_io_thread_notifier.h"
58 #include "content/browser/loader/resource_dispatcher_host_impl.h" 59 #include "content/browser/loader/resource_dispatcher_host_impl.h"
59 #include "content/browser/manifest/manifest_manager_host.h" 60 #include "content/browser/manifest/manifest_manager_host.h"
60 #include "content/browser/media/audio_stream_monitor.h" 61 #include "content/browser/media/audio_stream_monitor.h"
61 #include "content/browser/media/capture/web_contents_audio_muter.h" 62 #include "content/browser/media/capture/web_contents_audio_muter.h"
62 #include "content/browser/media/media_web_contents_observer.h" 63 #include "content/browser/media/media_web_contents_observer.h"
63 #include "content/browser/media/session/media_session.h" 64 #include "content/browser/media/session/media_session.h"
64 #include "content/browser/message_port_message_filter.h" 65 #include "content/browser/message_port_message_filter.h"
65 #include "content/browser/plugin_content_origin_whitelist.h" 66 #include "content/browser/plugin_content_origin_whitelist.h"
66 #include "content/browser/renderer_host/render_process_host_impl.h" 67 #include "content/browser/renderer_host/render_process_host_impl.h"
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 #else 463 #else
463 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); 464 media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
464 #endif 465 #endif
465 #if defined (ENABLE_PLUGINS) 466 #if defined (ENABLE_PLUGINS)
466 pepper_playback_observer_.reset(new PepperPlaybackObserver(this)); 467 pepper_playback_observer_.reset(new PepperPlaybackObserver(this));
467 #endif 468 #endif
468 loader_io_thread_notifier_.reset(new LoaderIOThreadNotifier(this)); 469 loader_io_thread_notifier_.reset(new LoaderIOThreadNotifier(this));
469 wake_lock_service_context_.reset(new device::WakeLockServiceContext( 470 wake_lock_service_context_.reset(new device::WakeLockServiceContext(
470 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 471 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
471 base::Bind(&WebContentsImpl::GetNativeView, base::Unretained(this)))); 472 base::Bind(&WebContentsImpl::GetNativeView, base::Unretained(this))));
473 host_zoom_map_observer_.reset(new HostZoomMapObserver(this));
472 } 474 }
473 475
474 WebContentsImpl::~WebContentsImpl() { 476 WebContentsImpl::~WebContentsImpl() {
475 is_being_destroyed_ = true; 477 is_being_destroyed_ = true;
476 478
477 rwh_input_event_router_.reset(); 479 rwh_input_event_router_.reset();
478 480
479 for (auto& entry : binding_sets_) 481 for (auto& entry : binding_sets_)
480 entry.second->CloseAllBindings(); 482 entry.second->CloseAllBindings();
481 483
(...skipping 4724 matching lines...) Expand 10 before | Expand all | Expand 10 after
5206 dialog_manager_ = dialog_manager; 5208 dialog_manager_ = dialog_manager;
5207 } 5209 }
5208 5210
5209 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { 5211 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
5210 auto it = binding_sets_.find(interface_name); 5212 auto it = binding_sets_.find(interface_name);
5211 if (it != binding_sets_.end()) 5213 if (it != binding_sets_.end())
5212 binding_sets_.erase(it); 5214 binding_sets_.erase(it);
5213 } 5215 }
5214 5216
5215 } // namespace content 5217 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698