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

Unified Diff: ash/test/test_shell_delegate.cc

Issue 9630002: Ash: Remove compact window mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: OpaqueBrowserFrameView, MultipleWindowIndicatorButton Created 8 years, 9 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/test/test_shell_delegate.h ('k') | ash/wm/compact_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 6ec4864a7fbd5c3d3fab2df4535a65f2bd5ad5f3..16caee53757786dc95a7bf207215b703b4092ea4 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -15,19 +15,12 @@
namespace ash {
namespace test {
-TestShellDelegate::TestShellDelegate()
- : override_window_mode_(false),
- window_mode_(Shell::MODE_MANAGED) {
+TestShellDelegate::TestShellDelegate() {
}
TestShellDelegate::~TestShellDelegate() {
}
-void TestShellDelegate::SetOverrideWindowMode(Shell::WindowMode window_mode) {
- override_window_mode_ = true;
- window_mode_ = window_mode;
-}
-
views::Widget* TestShellDelegate::CreateStatusArea() {
return NULL;
}
@@ -45,17 +38,14 @@ AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
}
std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList(
- CycleSource source,
- CycleOrder order) const {
+ CycleSource source) const {
// We just use the Shell's default container of windows, so tests can be
// written with the usual CreateTestWindowWithId() calls. But window cycling
- // expects the topmost window at the front of the list, so reverse the order
- // if we are mimicking MRU.
+ // expects the topmost window at the front of the list, so reverse the order.
aura::Window* default_container = Shell::GetInstance()->GetContainer(
internal::kShellWindowId_DefaultContainer);
std::vector<aura::Window*> windows = default_container->children();
- if (order != ShellDelegate::ORDER_LINEAR)
- std::reverse(windows.begin(), windows.end());
+ std::reverse(windows.begin(), windows.end());
return windows;
}
@@ -75,13 +65,5 @@ SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
return NULL;
}
-bool TestShellDelegate::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
- if (override_window_mode_) {
- *window_mode = window_mode_;
- return true;
- }
- return false;
-}
-
} // namespace test
} // namespace ash
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/wm/compact_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698