mash: Merge ChromeLauncherController and *Impl subclass.

ash/shell_delegate.h

 // Copyright (c) 2012 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 ASH_SHELL_DELEGATE_H_
 #define ASH_SHELL_DELEGATE_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 70 matching lines @@
   // Invoked when the user uses Ctrl-Shift-Q to close chrome.
   virtual void Exit() = 0;
 
   // Create a shell-specific keyboard::KeyboardUI
   virtual keyboard::KeyboardUI* CreateKeyboardUI() = 0;
 
   // Opens the |url| in a new browser tab.
   virtual void OpenUrlFromArc(const GURL& url) = 0;
 
   // Functions called when the shelf is initialized and shut down.
-  // TODO(msw): Refine ChromeLauncherControllerImpl lifetime management.
+  // TODO(msw): Refine ChromeLauncherController lifetime management.
   virtual void ShelfInit() = 0;
   virtual void ShelfShutdown() = 0;
 
   // Creates a system-tray delegate. Shell takes ownership of the delegate.
   virtual SystemTrayDelegate* CreateSystemTrayDelegate() = 0;
 
   // Creates a wallpaper delegate. Shell takes ownership of the delegate.
   virtual std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() = 0;
 
   // Creates a session state delegate. Shell takes ownership of the delegate.
@@ skipping 32 matching lines @@
   // if both local state and user prefs are enabled, otherwise disabled.
   virtual void UpdateTouchscreenStatusFromPrefs() = 0;
 
   // Toggles the status of touchpad between enabled and disabled.
   virtual void ToggleTouchpad() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_DELEGATE_H_