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

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

Issue 1951523002: Add basic support for launching mash shelf pinned apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only LaunchItem with no windows; otherwise kNoAction (for CreateApplicationMenu). Created 4 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
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 1d82489683e1c74e4fda6fbc8646c2758f845449..de76ffc88b68a9a7242b1886d42b9191bc36eb68 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -28,7 +28,6 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
#include "chrome/browser/ui/ash/launcher/launcher_app_updater.h"
-#include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
#include "components/prefs/pref_change_registrar.h"
#include "components/syncable_prefs/pref_service_syncable_observer.h"
#include "extensions/common/constants.h"
@@ -38,7 +37,6 @@ class AppSyncUIState;
class Browser;
class BrowserShortcutLauncherItemController;
class BrowserStatusMonitor;
-class ExtensionEnableFlow;
class GURL;
class LauncherControllerHelper;
class LauncherItemController;
@@ -90,7 +88,6 @@ class ChromeLauncherController
public AppIconLoaderDelegate,
public syncable_prefs::PrefServiceSyncableObserver,
public AppSyncUIStateObserver,
- public ExtensionEnableFlowDelegate,
public LauncherAppUpdater::Delegate,
public ash::ShelfItemDelegateManagerObserver {
public:
@@ -290,10 +287,6 @@ class ChromeLauncherController
// AppSyncUIStateObserver:
void OnAppSyncUIStatusChanged() override;
- // ExtensionEnableFlowDelegate:
- void ExtensionEnableFlowFinished() override;
- void ExtensionEnableFlowAborted(bool user_initiated) override;
-
// AppIconLoaderDelegate:
void OnAppImageUpdated(const std::string& app_id,
const gfx::ImageSkia& image) override;
@@ -536,8 +529,6 @@ class ChromeLauncherController
AppSyncUIState* app_sync_ui_state_;
- std::unique_ptr<ExtensionEnableFlow> extension_enable_flow_;
-
// The owned browser status monitor.
std::unique_ptr<BrowserStatusMonitor> browser_status_monitor_;
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698