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

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

Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add ash::wm::ToggleMaximizedWindow to window_util.h Created 8 years, 2 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/test_shell_delegate.h ('k') | ash/wm/window_util.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/caps_lock_delegate_stub.h" 9 #include "ash/caps_lock_delegate_stub.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 "ash/test/test_launcher_delegate.h" 12 #include "ash/test/test_launcher_delegate.h"
13 #include "ash/wm/window_util.h"
13 #include "content/public/test/test_browser_context.h" 14 #include "content/public/test/test_browser_context.h"
14 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
15 16
16 namespace ash { 17 namespace ash {
17 namespace test { 18 namespace test {
18 19
19 TestShellDelegate::TestShellDelegate() 20 TestShellDelegate::TestShellDelegate()
20 : locked_(false), 21 : locked_(false),
21 spoken_feedback_enabled_(false) { 22 spoken_feedback_enabled_(false) {
22 } 23 }
(...skipping 30 matching lines...) Expand all
53 54
54 void TestShellDelegate::Exit() { 55 void TestShellDelegate::Exit() {
55 } 56 }
56 57
57 void TestShellDelegate::NewTab() { 58 void TestShellDelegate::NewTab() {
58 } 59 }
59 60
60 void TestShellDelegate::NewWindow(bool incognito) { 61 void TestShellDelegate::NewWindow(bool incognito) {
61 } 62 }
62 63
64 void TestShellDelegate::ToggleMaximized() {
65 aura::Window* window = ash::wm::GetActiveWindow();
66 if (window)
67 ash::wm::ToggleMaximizedWindow(window);
68 }
69
63 void TestShellDelegate::OpenFileManager(bool as_dialog) { 70 void TestShellDelegate::OpenFileManager(bool as_dialog) {
64 } 71 }
65 72
66 void TestShellDelegate::OpenCrosh() { 73 void TestShellDelegate::OpenCrosh() {
67 } 74 }
68 75
69 void TestShellDelegate::OpenMobileSetup(const std::string& service_path) { 76 void TestShellDelegate::OpenMobileSetup(const std::string& service_path) {
70 } 77 }
71 78
72 void TestShellDelegate::RestoreTab() { 79 void TestShellDelegate::RestoreTab() {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 149
143 void TestShellDelegate::SaveScreenMagnifierScale(double scale) { 150 void TestShellDelegate::SaveScreenMagnifierScale(double scale) {
144 } 151 }
145 152
146 double TestShellDelegate::GetSavedScreenMagnifierScale() { 153 double TestShellDelegate::GetSavedScreenMagnifierScale() {
147 return std::numeric_limits<double>::min(); 154 return std::numeric_limits<double>::min();
148 } 155 }
149 156
150 } // namespace test 157 } // namespace test
151 } // namespace ash 158 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | ash/wm/window_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698