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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

Issue 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chrome_mash_shelf_controller.cc update due namespace renaming Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 int event_flags) override; 45 int event_flags) override;
46 void ActivateApp(const std::string& app_id, 46 void ActivateApp(const std::string& app_id,
47 ash::LaunchSource source, 47 ash::LaunchSource source,
48 int event_flags) override; 48 int event_flags) override;
49 extensions::LaunchType GetLaunchType(ash::ShelfID id) override; 49 extensions::LaunchType GetLaunchType(ash::ShelfID id) override;
50 void SetLauncherItemImage(ash::ShelfID shelf_id, 50 void SetLauncherItemImage(ash::ShelfID shelf_id,
51 const gfx::ImageSkia& image) override; 51 const gfx::ImageSkia& image) override;
52 bool IsWindowedAppInLauncher(const std::string& app_id) override; 52 bool IsWindowedAppInLauncher(const std::string& app_id) override;
53 void SetLaunchType(ash::ShelfID id, 53 void SetLaunchType(ash::ShelfID id,
54 extensions::LaunchType launch_type) override; 54 extensions::LaunchType launch_type) override;
55 void PersistPinnedState() override;
56 Profile* GetProfile() override; 55 Profile* GetProfile() override;
57 void UpdateAppState(content::WebContents* contents, 56 void UpdateAppState(content::WebContents* contents,
58 AppState app_state) override; 57 AppState app_state) override;
59 ash::ShelfID GetShelfIDForWebContents( 58 ash::ShelfID GetShelfIDForWebContents(
60 content::WebContents* contents) override; 59 content::WebContents* contents) override;
61 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 60 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
62 const extensions::Extension* GetExtensionForAppID( 61 const extensions::Extension* GetExtensionForAppID(
63 const std::string& app_id) const override; 62 const std::string& app_id) const override;
64 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive( 63 ash::ShelfItemDelegate::PerformedAction ActivateWindowOrMinimizeIfActive(
65 ui::BaseWindow* window, 64 ui::BaseWindow* window,
(...skipping 28 matching lines...) Expand all
94 93
95 private: 94 private:
96 ChromeLauncherControllerMus(); 95 ChromeLauncherControllerMus();
97 96
98 std::unique_ptr<ChromeMashShelfController> shelf_controller_; 97 std::unique_ptr<ChromeMashShelfController> shelf_controller_;
99 98
100 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 99 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
101 }; 100 };
102 101
103 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 102 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698