| OLD | NEW |
| 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/common/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/aura/wm_window_aura.h" | 10 #include "ash/aura/wm_window_aura.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 TestShellObserver() : call_count_(0), | 67 TestShellObserver() : call_count_(0), |
| 68 is_fullscreen_(false) { | 68 is_fullscreen_(false) { |
| 69 Shell::GetInstance()->AddShellObserver(this); | 69 Shell::GetInstance()->AddShellObserver(this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 ~TestShellObserver() override { | 72 ~TestShellObserver() override { |
| 73 Shell::GetInstance()->RemoveShellObserver(this); | 73 Shell::GetInstance()->RemoveShellObserver(this); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void OnFullscreenStateChanged(bool is_fullscreen, | 76 void OnFullscreenStateChanged(bool is_fullscreen, |
| 77 aura::Window* root_window) override { | 77 WmWindow* root_window) override { |
| 78 call_count_++; | 78 call_count_++; |
| 79 is_fullscreen_ = is_fullscreen; | 79 is_fullscreen_ = is_fullscreen; |
| 80 } | 80 } |
| 81 | 81 |
| 82 int call_count() const { | 82 int call_count() const { |
| 83 return call_count_; | 83 return call_count_; |
| 84 } | 84 } |
| 85 | 85 |
| 86 bool is_fullscreen() const { | 86 bool is_fullscreen() const { |
| 87 return is_fullscreen_; | 87 return is_fullscreen_; |
| (...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1152 EXPECT_EQ(gfx::Rect(50, | 1152 EXPECT_EQ(gfx::Rect(50, |
| 1153 keyboard_bounds.y() - keyboard_bounds.height()/2, | 1153 keyboard_bounds.y() - keyboard_bounds.height()/2, |
| 1154 occluded_window_bounds.width(), | 1154 occluded_window_bounds.width(), |
| 1155 occluded_window_bounds.height()).ToString(), | 1155 occluded_window_bounds.height()).ToString(), |
| 1156 window->bounds().ToString()); | 1156 window->bounds().ToString()); |
| 1157 HideKeyboard(); | 1157 HideKeyboard(); |
| 1158 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); | 1158 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); |
| 1159 } | 1159 } |
| 1160 | 1160 |
| 1161 } // namespace ash | 1161 } // namespace ash |
| OLD | NEW |