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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

Issue 2835063003: mash: Use ChromeLauncherControllerImpl, remove Mus subclass stub. (Closed)
Patch Set: Add comment and separate mash-only members. Created 3 years, 8 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_controller_mus.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
deleted file mode 100644
index 51babed985fa122db4e726397bc56f79c3edaeb8..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2016 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_CHROME_LAUNCHER_CONTROLLER_MUS_H_
-#define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
-
-#include <string>
-
-#include "base/macros.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-
-class ChromeLauncherControllerMus : public ChromeLauncherController {
- public:
- ChromeLauncherControllerMus();
- ~ChromeLauncherControllerMus() override;
-
- // ChromeLauncherController:
- ash::ShelfID CreateAppLauncherItem(
- std::unique_ptr<ash::ShelfItemDelegate> item_delegate,
- ash::ShelfItemStatus status) override;
- const ash::ShelfItem* GetItem(ash::ShelfID id) const override;
- void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
- void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
- void CloseLauncherItem(ash::ShelfID id) override;
- bool IsPinned(ash::ShelfID id) override;
- void SetV1AppStatus(const std::string& app_id,
- ash::ShelfItemStatus status) override;
- void Launch(ash::ShelfID id, int event_flags) override;
- void Close(ash::ShelfID id) override;
- bool IsOpen(ash::ShelfID id) override;
- bool IsPlatformApp(ash::ShelfID id) override;
- void ActivateApp(const std::string& app_id,
- ash::ShelfLaunchSource source,
- int event_flags) override;
- void SetLauncherItemImage(ash::ShelfID shelf_id,
- const gfx::ImageSkia& image) override;
- void UpdateAppState(content::WebContents* contents,
- AppState app_state) override;
- ash::ShelfID GetShelfIDForWebContents(
- content::WebContents* contents) override;
- void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
- ash::ShelfAction ActivateWindowOrMinimizeIfActive(
- ui::BaseWindow* window,
- bool allow_minimize) override;
- void ActiveUserChanged(const std::string& user_email) override;
- void AdditionalUserAddedToSession(Profile* profile) override;
- ash::MenuItemList GetAppMenuItemsForTesting(
- const ash::ShelfItem& item) override;
- std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
- const std::string& app_id) override;
- void ActivateShellApp(const std::string& app_id, int window_index) override;
- bool IsWebContentHandledByApplication(content::WebContents* web_contents,
- const std::string& app_id) override;
- bool ContentCanBeHandledByGmailApp(
- content::WebContents* web_contents) override;
- gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
- base::string16 GetAppListTitle(
- content::WebContents* web_contents) const override;
- BrowserShortcutLauncherItemController*
- GetBrowserShortcutLauncherItemController() override;
- bool ShelfBoundsChangesProbablyWithUser(
- ash::WmShelf* shelf,
- const AccountId& account_id) const override;
- void OnUserProfileReadyToSwitch(Profile* profile) override;
- ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
- const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override;
-
- // AppIconLoaderDelegate:
- void OnAppImageUpdated(const std::string& app_id,
- const gfx::ImageSkia& image) override;
-
- protected:
- // ChromeLauncherController:
- void OnInit() override;
-
- private:
- // Pin the items set in the current profile's preferences.
- void PinAppsFromPrefs();
-
- DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
-};
-
-#endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_

Powered by Google App Engine
This is Rietveld 408576698