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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 11411180: move favicon download code from chrome/ into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: WebContentsObserver and callback Created 8 years 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 | Annotate | Revision Log
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "content/renderer/browser_plugin/browser_plugin.h" 64 #include "content/renderer/browser_plugin/browser_plugin.h"
65 #include "content/renderer/browser_plugin/browser_plugin_manager.h" 65 #include "content/renderer/browser_plugin/browser_plugin_manager.h"
66 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 66 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
67 #include "content/renderer/device_orientation_dispatcher.h" 67 #include "content/renderer/device_orientation_dispatcher.h"
68 #include "content/renderer/devtools_agent.h" 68 #include "content/renderer/devtools_agent.h"
69 #include "content/renderer/disambiguation_popup_helper.h" 69 #include "content/renderer/disambiguation_popup_helper.h"
70 #include "content/renderer/dom_automation_controller.h" 70 #include "content/renderer/dom_automation_controller.h"
71 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" 71 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
72 #include "content/renderer/do_not_track_bindings.h" 72 #include "content/renderer/do_not_track_bindings.h"
73 #include "content/renderer/external_popup_menu.h" 73 #include "content/renderer/external_popup_menu.h"
74 #include "content/renderer/favicon_helper.h"
74 #include "content/renderer/geolocation_dispatcher.h" 75 #include "content/renderer/geolocation_dispatcher.h"
75 #include "content/renderer/gpu/compositor_thread.h" 76 #include "content/renderer/gpu/compositor_thread.h"
76 #include "content/renderer/gpu/compositor_output_surface.h" 77 #include "content/renderer/gpu/compositor_output_surface.h"
77 #include "content/renderer/gpu/compositor_software_output_device_gl_adapter.h" 78 #include "content/renderer/gpu/compositor_software_output_device_gl_adapter.h"
78 #include "content/renderer/idle_user_detector.h" 79 #include "content/renderer/idle_user_detector.h"
79 #include "content/renderer/input_tag_speech_dispatcher.h" 80 #include "content/renderer/input_tag_speech_dispatcher.h"
80 #include "content/renderer/java/java_bridge_dispatcher.h" 81 #include "content/renderer/java/java_bridge_dispatcher.h"
81 #include "content/renderer/load_progress_tracker.h" 82 #include "content/renderer/load_progress_tracker.h"
82 #include "content/renderer/media/media_stream_dependency_factory.h" 83 #include "content/renderer/media/media_stream_dependency_factory.h"
83 #include "content/renderer/media/media_stream_dispatcher.h" 84 #include "content/renderer/media/media_stream_dispatcher.h"
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 speech_recognition_dispatcher_(NULL), 585 speech_recognition_dispatcher_(NULL),
585 device_orientation_dispatcher_(NULL), 586 device_orientation_dispatcher_(NULL),
586 media_stream_dispatcher_(NULL), 587 media_stream_dispatcher_(NULL),
587 browser_plugin_manager_(NULL), 588 browser_plugin_manager_(NULL),
588 media_stream_impl_(NULL), 589 media_stream_impl_(NULL),
589 devtools_agent_(NULL), 590 devtools_agent_(NULL),
590 accessibility_mode_(AccessibilityModeOff), 591 accessibility_mode_(AccessibilityModeOff),
591 renderer_accessibility_(NULL), 592 renderer_accessibility_(NULL),
592 java_bridge_dispatcher_(NULL), 593 java_bridge_dispatcher_(NULL),
593 mouse_lock_dispatcher_(NULL), 594 mouse_lock_dispatcher_(NULL),
595 favicon_helper_(NULL),
594 #if defined(OS_ANDROID) 596 #if defined(OS_ANDROID)
595 body_background_color_(SK_ColorWHITE), 597 body_background_color_(SK_ColorWHITE),
596 update_frame_info_scheduled_(false), 598 update_frame_info_scheduled_(false),
597 expected_content_intent_id_(0), 599 expected_content_intent_id_(0),
598 media_player_proxy_(NULL), 600 media_player_proxy_(NULL),
599 synchronous_find_active_match_ordinal_(-1), 601 synchronous_find_active_match_ordinal_(-1),
600 ALLOW_THIS_IN_INITIALIZER_LIST( 602 ALLOW_THIS_IN_INITIALIZER_LIST(
601 load_progress_tracker_(new LoadProgressTracker(this))), 603 load_progress_tracker_(new LoadProgressTracker(this))),
602 #endif 604 #endif
603 session_storage_namespace_id_(params->session_storage_namespace_id), 605 session_storage_namespace_id_(params->session_storage_namespace_id),
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 #if defined(OS_ANDROID) 700 #if defined(OS_ANDROID)
699 media_player_manager_.reset( 701 media_player_manager_.reset(
700 new webkit_media::WebMediaPlayerManagerAndroid()); 702 new webkit_media::WebMediaPlayerManagerAndroid());
701 #endif 703 #endif
702 704
703 // The next group of objects all implement RenderViewObserver, so are deleted 705 // The next group of objects all implement RenderViewObserver, so are deleted
704 // along with the RenderView automatically. 706 // along with the RenderView automatically.
705 devtools_agent_ = new DevToolsAgent(this); 707 devtools_agent_ = new DevToolsAgent(this);
706 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); 708 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
707 intents_host_ = new WebIntentsHost(this); 709 intents_host_ = new WebIntentsHost(this);
710 favicon_helper_ = new FaviconHelper(this);
708 711
709 // Create renderer_accessibility_ if needed. 712 // Create renderer_accessibility_ if needed.
710 OnSetAccessibilityMode(params->accessibility_mode); 713 OnSetAccessibilityMode(params->accessibility_mode);
711 714
712 new IdleUserDetector(this); 715 new IdleUserDetector(this);
713 716
714 if (command_line.HasSwitch(switches::kDomAutomationController)) 717 if (command_line.HasSwitch(switches::kDomAutomationController))
715 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION; 718 enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
716 719
717 ProcessViewLayoutFlags(command_line); 720 ProcessViewLayoutFlags(command_line);
(...skipping 5720 matching lines...) Expand 10 before | Expand all | Expand 10 after
6438 } 6441 }
6439 #endif 6442 #endif
6440 6443
6441 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6444 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6442 TransportDIB::Handle dib_handle) { 6445 TransportDIB::Handle dib_handle) {
6443 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6446 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6444 RenderProcess::current()->ReleaseTransportDIB(dib); 6447 RenderProcess::current()->ReleaseTransportDIB(dib);
6445 } 6448 }
6446 6449
6447 } // namespace content 6450 } // namespace content
OLDNEW
« content/renderer/favicon_helper.cc ('K') | « content/renderer/render_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698