| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| index 5159b6df9428a0d7b39b906a1639ee9e661f7d64..2558c415aef968863a02c4ef4e65ed6db5ff24f0 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| @@ -36,19 +36,10 @@ void ChromeLauncherController::Init() {
|
| OnInit();
|
| }
|
|
|
| -void ChromeLauncherController::LaunchApp(const std::string& app_id,
|
| +void ChromeLauncherController::LaunchApp(ash::launcher::AppLauncherId id,
|
| ash::LaunchSource source,
|
| int event_flags) {
|
| - launcher_controller_helper_->LaunchApp(app_id, source, event_flags);
|
| -}
|
| -
|
| -void ChromeLauncherController::LaunchAppWithLaunchId(
|
| - const std::string& app_id,
|
| - const std::string& launch_id,
|
| - ash::LaunchSource source,
|
| - int event_flags) {
|
| - launcher_controller_helper_->LaunchAppWithLaunchId(app_id, launch_id, source,
|
| - event_flags);
|
| + launcher_controller_helper_->LaunchApp(id, source, event_flags);
|
| }
|
|
|
| ChromeLauncherController::ChromeLauncherController() : observer_binding_(this) {
|
|
|