Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

chrome/browser/ui/intents/web_intent_picker_controller.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 "chrome/browser/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 98 matching lines @@
         : wrapper_(wrapper),
           picker_factory_(factory),
           web_intent_data_fetcher_(
               new WebIntentDataFetcher(this,
                                        GetWebIntentsRegistry(wrapper))),
           favicon_fetcher_(
               new FaviconFetcher(this, GetFaviconService(wrapper))),
           picker_(NULL),
           pending_async_count_(0),
           service_tab_(NULL) {
-  NavigationController* controller = &wrapper->tab_contents()->GetController();
+  content::NavigationController* controller =
+      &wrapper->tab_contents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
                  content::Source<content::NavigationController>(controller));
 }
 
 WebIntentPickerController::~WebIntentPickerController() {
 }
 
 void WebIntentPickerController::SetIntentsDispatcher(
@@ skipping 193 matching lines @@
     if (gfx::PNGCodec::Decode(favicon_data.image_data->front(),
                               favicon_data.image_data->size(),
                               &icon_bitmap)) {
       controller_->OnFaviconDataAvailable(index, icon_bitmap);
       return;
     }
   }
 
   controller_->OnFaviconDataUnavailable(index);
 }