Convert BrowserStatusMonitor to use the new navigation callbacks.

chrome/browser/ui/ash/launcher/browser_status_monitor.cc

 // Copyright 2013 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/ash/launcher/browser_status_monitor.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/wm/public/activation_client.h"
 
 // This class monitors the WebContent of the all tab and notifies a navigation
 // to the BrowserStatusMonitor.
 class BrowserStatusMonitor::LocalWebContentsObserver
     : public content::WebContentsObserver {
  public:
   LocalWebContentsObserver(content::WebContents* contents,
                            BrowserStatusMonitor* monitor)
       : content::WebContentsObserver(contents),
         monitor_(monitor) {}
 
   ~LocalWebContentsObserver() override {}
 
   // content::WebContentsObserver
-  void DidNavigateMainFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) override {
+  void DidFinishNavigation(
+      content::NavigationHandle* navigation_handle) override {
+    if (!navigation_handle->IsInMainFrame() ||
+        !navigation_handle->HasCommitted())

[Mr4D (OOO till 08-26), 2017/01/30 16:28:25]

Just checking: Is it guaranteed that we will be called again once it has been
committed?

[jam, 2017/01/30 16:36:59]

This line is to keep parity between the old code: DidNavigateMainFrame was only
called for successful main frame navigations. DidFinishNavigation is called for
all frames (first part of if statement) and for navigations that don't go
through (i.e. downloads, 204/205s) (2nd part).

+      return;
+
     ChromeLauncherController::AppState state =
         ChromeLauncherController::APP_STATE_INACTIVE;
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
     // Don't assume that |browser| still exists.
     if (browser) {
       if (browser->window()->IsActive() &&
           browser->tab_strip_model()->GetActiveWebContents() == web_contents())
         state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
       else if (browser->window()->IsActive())
         state = ChromeLauncherController::APP_STATE_ACTIVE;
@@ skipping 233 matching lines @@
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }