ash: Minor cleanup, move more files from launcher to shelf.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
 
 #include <map>
 #include <string>
 
-#include "ash/launcher/scoped_observer_with_duplicated_sources.h"
+#include "ash/shelf/scoped_observer_with_duplicated_sources.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/display_observer.h"
 
 namespace aura {
@@ skipping 68 matching lines @@
 
   // Hold all observed root windows.
   ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
 
   BrowserToAppIDMap browser_to_app_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_