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

chrome/browser/tab_contents/language_state.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/tab_contents/language_state.h"
 
-#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 
+using content::NavigationController;
+
 LanguageState::LanguageState(NavigationController* nav_controller)
     : navigation_controller_(nav_controller),
       page_translatable_(false),
       translation_pending_(false),
       translation_declined_(false),
       in_page_navigation_(false) {
 }
 
 LanguageState::~LanguageState() {
 }
@@ skipping 48 matching lines @@
       prev_original_lang_ != prev_current_lang_ &&
       original_lang_ == current_lang_ &&
       navigation_controller_->GetActiveEntry() &&
       navigation_controller_->GetActiveEntry()->GetTransitionType() ==
           content::PAGE_TRANSITION_LINK) {
     return prev_current_lang_;
   }
 
   return std::string();
 }