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

Side by Side Diff: ash/shell.h

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « ash/screensaver/screensaver_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 static Shell* CreateInstance(ShellDelegate* delegate); 126 static Shell* CreateInstance(ShellDelegate* delegate);
127 127
128 // Should never be called before |CreateInstance()|. 128 // Should never be called before |CreateInstance()|.
129 static Shell* GetInstance(); 129 static Shell* GetInstance();
130 130
131 // Returns true if the ash shell has been instantiated. 131 // Returns true if the ash shell has been instantiated.
132 static bool HasInstance(); 132 static bool HasInstance();
133 133
134 static void DeleteInstance(); 134 static void DeleteInstance();
135 135
136 // Gets the singleton RootWindow used by the Shell. 136 // Gets the primary RootWindow. The primary RootWindow is the root window
137 static aura::RootWindow* GetRootWindow(); 137 // that has a launcher.
138 static aura::RootWindow* GetPrimaryRootWindow();
138 139
139 internal::RootWindowLayoutManager* root_window_layout() const { 140 internal::RootWindowLayoutManager* root_window_layout() const {
140 return root_window_layout_; 141 return root_window_layout_;
141 } 142 }
142 143
143 aura::Window* GetContainer(int container_id); 144 aura::Window* GetContainer(int container_id);
144 const aura::Window* GetContainer(int container_id) const; 145 const aura::Window* GetContainer(int container_id) const;
145 146
146 // Adds or removes |filter| from the RootWindowEventFilter. 147 // Adds or removes |filter| from the RootWindowEventFilter.
147 void AddRootWindowEventFilter(aura::EventFilter* filter); 148 void AddRootWindowEventFilter(aura::EventFilter* filter);
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 399
399 // Used by ash/shell. 400 // Used by ash/shell.
400 content::BrowserContext* browser_context_; 401 content::BrowserContext* browser_context_;
401 402
402 DISALLOW_COPY_AND_ASSIGN(Shell); 403 DISALLOW_COPY_AND_ASSIGN(Shell);
403 }; 404 };
404 405
405 } // namespace ash 406 } // namespace ash
406 407
407 #endif // ASH_SHELL_H_ 408 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698