OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/automation/testing_automation_provider.h" | 5 #include "chrome/browser/automation/testing_automation_provider.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/browser/automation/automation_window_tracker.h" | 8 #include "chrome/browser/automation/automation_window_tracker.h" |
9 #include "ui/aura/client/aura_constants.h" | 9 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
| 11 #include "ui/aura_shell/window_util.h" |
11 #include "ui/base/ui_base_types.h" | 12 #include "ui/base/ui_base_types.h" |
12 | 13 |
13 void TestingAutomationProvider::ActivateWindow(int handle) { | 14 void TestingAutomationProvider::ActivateWindow(int handle) { |
14 aura::Window* window = window_tracker_->GetResource(handle); | 15 aura::Window* window = window_tracker_->GetResource(handle); |
15 if (window) { | 16 if (window) { |
16 window->Activate(); | 17 aura_shell::ActivateWindow(window); |
17 } | 18 } |
18 } | 19 } |
19 | 20 |
20 void TestingAutomationProvider::IsWindowMaximized(int handle, | 21 void TestingAutomationProvider::IsWindowMaximized(int handle, |
21 bool* is_maximized, | 22 bool* is_maximized, |
22 bool* success) { | 23 bool* success) { |
23 aura::Window* window = window_tracker_->GetResource(handle); | 24 aura::Window* window = window_tracker_->GetResource(handle); |
24 if (window) { | 25 if (window) { |
25 int show_state = window->GetIntProperty(aura::kShowStateKey); | 26 int show_state = window->GetIntProperty(aura::kShowStateKey); |
26 *is_maximized = (show_state == ui::SHOW_STATE_MAXIMIZED); | 27 *is_maximized = (show_state == ui::SHOW_STATE_MAXIMIZED); |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 *result = false; | 77 *result = false; |
77 } | 78 } |
78 } | 79 } |
79 | 80 |
80 void TestingAutomationProvider::GetWindowTitle(int handle, string16* text) { | 81 void TestingAutomationProvider::GetWindowTitle(int handle, string16* text) { |
81 const aura::Window* window = window_tracker_->GetResource(handle); | 82 const aura::Window* window = window_tracker_->GetResource(handle); |
82 DCHECK(window); | 83 DCHECK(window); |
83 *text = window->title(); | 84 *text = window->title(); |
84 } | 85 } |
85 | 86 |
OLD | NEW |