Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(846)

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)
Patch Set: Address comments. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
deleted file mode 100644
index c217f9c5cfe92c65ab27c020274c05b3ad84346b..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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.
-
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h"
-
-#include "ash/wm/window_util.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "content/public/browser/notification_service.h"
-#include "ui/events/event_constants.h"
-
-ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser(
- const base::string16 title,
- const gfx::Image* icon,
- Browser* browser)
- : ash::ShelfApplicationMenuItem(title, icon), browser_(browser) {
- DCHECK(browser);
- registrar_.Add(this,
- chrome::NOTIFICATION_BROWSER_CLOSING,
- content::Source<Browser>(browser));
-}
-
-ChromeLauncherAppMenuItemBrowser::~ChromeLauncherAppMenuItemBrowser() {}
-
-void ChromeLauncherAppMenuItemBrowser::Execute(int event_flags) {
- if (browser_) {
- if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) {
- TabStripModel* tab_strip = browser_->tab_strip_model();
- tab_strip->CloseAllTabs();
- } else {
- // In ChromeOS multiprofile scenario we might need to teleport the window
- // back to the current user desktop.
- multi_user_util::MoveWindowToCurrentDesktop(
- browser_->window()->GetNativeWindow());
- browser_->window()->Show();
- ash::wm::ActivateWindow(browser_->window()->GetNativeWindow());
- }
- }
-}
-
-void ChromeLauncherAppMenuItemBrowser::Observe(
- int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) {
- DCHECK_EQ(chrome::NOTIFICATION_BROWSER_CLOSING, type);
- DCHECK_EQ(browser_, content::Source<Browser>(source).ptr());
- registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
- content::Source<Browser>(browser_));
- browser_ = nullptr;
-}

Powered by Google App Engine
This is Rietveld 408576698