Moved methods that don't rely on internal state out of ChromeLauncherController.

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/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/stl_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/settings_window_manager.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 127 matching lines @@
 
 void BrowserStatusMonitor::UpdateAppItemState(
     content::WebContents* contents,
     ChromeLauncherController::AppState app_state) {
   DCHECK(contents);
   // It is possible to come here from Browser::SwapTabContent where the contents
   // cannot be associated with a browser. A removal however should be properly
   // processed.
   Browser* browser = chrome::FindBrowserWithWebContents(contents);
   if (app_state == ChromeLauncherController::APP_STATE_REMOVED ||
-      (browser && launcher_controller_->IsBrowserFromActiveUser(browser)))
+      (browser && IsBrowserFromActiveUser(browser)))
     launcher_controller_->UpdateAppState(contents, app_state);
 }
 
 void BrowserStatusMonitor::UpdateBrowserItemState() {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       UpdateBrowserItemState();
 }
 
 void BrowserStatusMonitor::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
@@ skipping 206 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);
 }