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

Unified Diff: extensions/shell/browser/shell_desktop_controller.h

Issue 571643003: Remove app_shell chrome.shell API and ShellAppWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (remove-shell) rebase 2 Created 6 years, 3 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 | « extensions/shell/browser/shell_app_window.cc ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_desktop_controller.h
diff --git a/extensions/shell/browser/shell_desktop_controller.h b/extensions/shell/browser/shell_desktop_controller.h
index d6d9d156fbe01930c4dac440f350aea8b5fb9e98..6e0d1c502cde63a603012849ee63841a3a862ced 100644
--- a/extensions/shell/browser/shell_desktop_controller.h
+++ b/extensions/shell/browser/shell_desktop_controller.h
@@ -51,7 +51,6 @@ class UserActivityDetector;
namespace extensions {
class Extension;
-class ShellAppWindow;
// Handles desktop-related tasks for app_shell.
class ShellDesktopController : public DesktopController,
@@ -67,9 +66,6 @@ class ShellDesktopController : public DesktopController,
// DesktopController:
virtual aura::WindowTreeHost* GetHost() OVERRIDE;
- virtual ShellAppWindow* CreateShellAppWindow(
- content::BrowserContext* context,
- const Extension* extension) OVERRIDE;
virtual AppWindow* CreateAppWindow(content::BrowserContext* context,
const Extension* extension) OVERRIDE;
virtual void AddAppWindow(aura::Window* window) OVERRIDE;
@@ -134,7 +130,6 @@ class ShellDesktopController : public DesktopController,
#endif
// The desktop supports a single app window.
- scoped_ptr<ShellAppWindow> shell_app_window_;
AppWindow* app_window_; // NativeAppWindow::Close() deletes this.
DISALLOW_COPY_AND_ASSIGN(ShellDesktopController);
« no previous file with comments | « extensions/shell/browser/shell_app_window.cc ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698