| 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/screen_ash.h" | 5 #include "ash/screen_ash.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "ash/test/test_shell_delegate.h" | 8 #include "ash/test/test_shell_delegate.h" |
| 9 #include "ash/wm/window_positioner.h" | 9 #include "ash/wm/window_positioner.h" |
| 10 #include "ash/wm/window_resizer.h" | 10 #include "ash/wm/window_resizer.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 // TestBrowserWindow overrides: | 40 // TestBrowserWindow overrides: |
| 41 virtual void Show() OVERRIDE { | 41 virtual void Show() OVERRIDE { |
| 42 native_window_->Show(); | 42 native_window_->Show(); |
| 43 Activate(); | 43 Activate(); |
| 44 } | 44 } |
| 45 virtual void Hide() OVERRIDE { | 45 virtual void Hide() OVERRIDE { |
| 46 native_window_->Hide(); | 46 native_window_->Hide(); |
| 47 } | 47 } |
| 48 virtual void Activate() OVERRIDE { | 48 virtual void Activate() OVERRIDE { |
| 49 GetActivationClient( | 49 aura::client::GetActivationClient( |
| 50 native_window_->GetRootWindow())->ActivateWindow(native_window_.get()); | 50 native_window_->GetRootWindow())->ActivateWindow(native_window_.get()); |
| 51 } | 51 } |
| 52 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE { | 52 virtual gfx::NativeWindow GetNativeWindow() OVERRIDE { |
| 53 return native_window_.get(); | 53 return native_window_.get(); |
| 54 } | 54 } |
| 55 virtual gfx::Rect GetBounds() const OVERRIDE { | 55 virtual gfx::Rect GetBounds() const OVERRIDE { |
| 56 return native_window_->bounds(); | 56 return native_window_->bounds(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 Browser* browser() { return browser_.get(); } | 59 Browser* browser() { return browser_.get(); } |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 browser_window->browser(), | 834 browser_window->browser(), |
| 835 p1600x1200), ui::SHOW_STATE_MAXIMIZED); | 835 p1600x1200), ui::SHOW_STATE_MAXIMIZED); |
| 836 | 836 |
| 837 // The popup should favor the initial show state over the command line. | 837 // The popup should favor the initial show state over the command line. |
| 838 EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL, | 838 EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL, |
| 839 ui::SHOW_STATE_NORMAL, | 839 ui::SHOW_STATE_NORMAL, |
| 840 BOTH, | 840 BOTH, |
| 841 browser_popup->browser(), | 841 browser_popup->browser(), |
| 842 p1600x1200), ui::SHOW_STATE_NORMAL); | 842 p1600x1200), ui::SHOW_STATE_NORMAL); |
| 843 } | 843 } |
| OLD | NEW |