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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 9600006: Aura: Remove overlapping window mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/toplevel_layout_manager.h » ('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 #include "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "grit/ui_resources.h" 12 #include "grit/ui_resources.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace test { 16 namespace test {
17 17
18 TestShellDelegate::TestShellDelegate() 18 TestShellDelegate::TestShellDelegate()
19 : override_window_mode_(false), 19 : override_window_mode_(false),
20 window_mode_(Shell::MODE_OVERLAPPING) { 20 window_mode_(Shell::MODE_MANAGED) {
21 } 21 }
22 22
23 TestShellDelegate::~TestShellDelegate() { 23 TestShellDelegate::~TestShellDelegate() {
24 } 24 }
25 25
26 void TestShellDelegate::SetOverrideWindowMode(Shell::WindowMode window_mode) { 26 void TestShellDelegate::SetOverrideWindowMode(Shell::WindowMode window_mode) {
27 override_window_mode_ = true; 27 override_window_mode_ = true;
28 window_mode_ = window_mode; 28 window_mode_ = window_mode;
29 } 29 }
30 30
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 bool TestShellDelegate::GetOverrideWindowMode(Shell::WindowMode* window_mode) { 78 bool TestShellDelegate::GetOverrideWindowMode(Shell::WindowMode* window_mode) {
79 if (override_window_mode_) { 79 if (override_window_mode_) {
80 *window_mode = window_mode_; 80 *window_mode = window_mode_;
81 return true; 81 return true;
82 } 82 }
83 return false; 83 return false;
84 } 84 }
85 85
86 } // namespace test 86 } // namespace test
87 } // namespace ash 87 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.cc ('k') | ash/wm/toplevel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698