| Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| index da46397ff11406867544f9617056b9993a918e74..0a838d626474ba60ff7c683a13254f9509ca1e65 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
|
| @@ -64,13 +64,12 @@ BrowserShortcutLauncherItemController::BrowserShortcutLauncherItemController(
|
| ChromeLauncherController* launcher_controller,
|
| ash::ShelfModel* shelf_model)
|
| : LauncherItemController(extension_misc::kChromeAppId,
|
| - "",
|
| + std::string(),
|
| launcher_controller),
|
| shelf_model_(shelf_model) {}
|
|
|
| BrowserShortcutLauncherItemController::
|
| - ~BrowserShortcutLauncherItemController() {
|
| -}
|
| + ~BrowserShortcutLauncherItemController() {}
|
|
|
| void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
|
| // Determine the new browser's active state and change if necessary.
|
| @@ -129,10 +128,6 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
|
| launcher_controller()->GetShelfIDForWebContents(web_contents));
|
| }
|
|
|
| -void BrowserShortcutLauncherItemController::Launch(ash::LaunchSource source,
|
| - int event_flags) {
|
| -}
|
| -
|
| ash::ShelfItemDelegate::PerformedAction
|
| BrowserShortcutLauncherItemController::Activate(ash::LaunchSource source) {
|
| Browser* last_browser =
|
|
|