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

Unified Diff: athena/screen/public/screen_manager.h

Issue 480353006: Separate athena's startup process from AppShell's (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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 | « athena/main/athena_main.gyp ('k') | athena/screen/public/screen_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/screen/public/screen_manager.h
diff --git a/athena/screen/public/screen_manager.h b/athena/screen/public/screen_manager.h
index efaa7e87620bd8f1cb8159ada217df0fcc1aa2c2..52dd805646aed026be2ce542c7acd43657d505f5 100644
--- a/athena/screen/public/screen_manager.h
+++ b/athena/screen/public/screen_manager.h
@@ -51,16 +51,12 @@ class ATHENA_EXPORT ScreenManager {
// Creates, returns and deletes the singleton object of the ScreenManager
// implementation.
- static ScreenManager* Create(ScreenManagerDelegate* delegate,
- aura::Window* root);
+ static ScreenManager* Create(aura::Window* root);
static ScreenManager* Get();
static void Shutdown();
virtual ~ScreenManager() {}
- // Sets the screen's work area insets.
- virtual void SetWorkAreaInsets(const gfx::Insets& insets) = 0;
-
// Creates the container window that is used when creating a normal
// widget without specific parent.
virtual aura::Window* CreateDefaultContainer(
@@ -83,10 +79,6 @@ class ATHENA_EXPORT ScreenManager {
// Returns the LayerAnimator to use to animate the entire screen (e.g. fade
// screen to white).
virtual ui::LayerAnimator* GetScreenAnimator() = 0;
-
- // Create a focus rules.
- // TODO(oshima): Make this virtual function.
- static wm::FocusRules* CreateFocusRules();
};
} // namespace athena
« no previous file with comments | « athena/main/athena_main.gyp ('k') | athena/screen/public/screen_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698