Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

content/renderer/render_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_view_commands.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/page_load_histograms.h"
-#include "chrome/renderer/print_web_view_helper.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/searchbox.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 #include "chrome/renderer/translate_helper.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/content_constants.h"
@@ skipping 437 matching lines @@
       target_url_status_(TARGET_NONE),
       view_type_(ViewType::INVALID),
       browser_window_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(pepper_delegate_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(accessibility_method_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)),
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
-      print_helper_(NULL),
-      searchbox_(NULL),
       spellcheck_provider_(NULL),
       accessibility_ack_pending_(false),
       p2p_socket_dispatcher_(NULL),
       pending_app_icon_requests_(0),
       session_storage_namespace_id_(session_storage_namespace_id) {
 
   ClearBlockedContentSettings();
 
   routing_id_ = routing_id;
   if (opener_id != MSG_ROUTING_NONE)
@@ skipping 39 matching lines @@
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BindingsPolicy::DOM_AUTOMATION;
   if (command_line.HasSwitch(switches::kEnableAccessibility))
     WebAccessibilityCache::enableAccessibility();
 
   audio_message_filter_ = new AudioMessageFilter(routing_id_);
   render_thread_->AddFilter(audio_message_filter_);
 
-  print_helper_ = new PrintWebViewHelper(this);
-  searchbox_ = new SearchBox(this);
-
   RenderThread* current_thread = RenderThread::current();
   SpellCheck* spellcheck = current_thread ? current_thread->spellchecker() : 0;
   spellcheck_provider_ = new SpellCheckProvider(this, spellcheck);
   webview()->setSpellCheckClient(spellcheck_provider_);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableP2PApi)) {
     p2p_socket_dispatcher_ = new P2PSocketDispatcher(this);
   }
 
@@ skipping 1357 matching lines @@
   DCHECK(!external_popup_menu_.get());
   external_popup_menu_.reset(
       new ExternalPopupMenu(this, popup_menu_info, popup_menu_client));
   return external_popup_menu_.get();
 }
 
 webkit::ppapi::FullscreenContainer*
 RenderView::CreatePepperFullscreenContainer(
     webkit::ppapi::PluginInstance* plugin) {
   GURL active_url;
-  if(webview() && webview()->mainFrame())
+  if (webview() && webview()->mainFrame())
     active_url = GURL(webview()->mainFrame()->url());
   RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create(
       routing_id_, render_thread_, plugin, active_url);
   widget->show(WebKit::WebNavigationPolicyIgnore);
   return widget;
 }
 
 WebStorageNamespace* RenderView::createSessionStorageNamespace(unsigned quota) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return WebStorageNamespace::createSessionStorageNamespace(quota);
   CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
   return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
                                              session_storage_namespace_id_);
 }
 
 void RenderView::didAddMessageToConsole(
     const WebConsoleMessage& message, const WebString& source_name,
     unsigned source_line) {
   Send(new ViewHostMsg_AddMessageToConsole(routing_id_,
                                            UTF16ToWideHack(message.text),
                                            static_cast<int32>(source_line),
                                            UTF16ToWideHack(source_name)));
 }
 
 void RenderView::printPage(WebFrame* frame) {
-  print_helper_->ScriptInitiatedPrint(frame);
+  FOR_EACH_OBSERVER(RenderViewObserver, observers_, PrintPage(frame));
 }
 
 WebKit::WebNotificationPresenter* RenderView::notificationPresenter() {
   return notification_provider_;
 }
 
 void RenderView::didStartLoading() {
   if (is_loading_) {
     DLOG(WARNING) << "didStartLoading called while loading";
     return;
@@ skipping 3064 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }