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

Side by Side Diff: chrome/test/base/interactive_test_utils_win.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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
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 "chrome/test/base/interactive_test_utils.h" 5 #include "chrome/test/base/interactive_test_utils.h"
6 6
7 #include <Psapi.h> 7 #include <Psapi.h>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "chrome/browser/ui/host_desktop.h" 13 #include "chrome/browser/ui/host_desktop.h"
14 #include "chrome/test/base/interactive_test_utils_aura.h" 14 #include "chrome/test/base/interactive_test_utils_aura.h"
15 #include "ui/aura/window_tree_host.h" 15 #include "ui/aura/window_tree_host.h"
16 #include "ui/base/test/ui_controls.h" 16 #include "ui/base/test/ui_controls.h"
17 #include "ui/base/win/foreground_helper.h" 17 #include "ui/base/win/foreground_helper.h"
18 #include "ui/views/focus/focus_manager.h" 18 #include "ui/views/focus/focus_manager.h"
19 19
20 namespace ui_test_utils { 20 namespace ui_test_utils {
21 21
22 void HideNativeWindow(gfx::NativeWindow window) { 22 void HideNativeWindow(gfx::NativeWindow window) {
23 if (chrome::GetHostDesktopTypeForNativeWindow(window) == 23 if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
24 chrome::HOST_DESKTOP_TYPE_ASH) { 24 ui::HOST_DESKTOP_TYPE_ASH) {
25 HideNativeWindowAura(window); 25 HideNativeWindowAura(window);
26 return; 26 return;
27 } 27 }
28 HWND hwnd = window->GetHost()->GetAcceleratedWidget(); 28 HWND hwnd = window->GetHost()->GetAcceleratedWidget();
29 ::ShowWindow(hwnd, SW_HIDE); 29 ::ShowWindow(hwnd, SW_HIDE);
30 } 30 }
31 31
32 bool ShowAndFocusNativeWindow(gfx::NativeWindow window) { 32 bool ShowAndFocusNativeWindow(gfx::NativeWindow window) {
33 if (chrome::GetHostDesktopTypeForNativeWindow(window) == 33 if (chrome::GetHostDesktopTypeForNativeWindow(window) ==
34 chrome::HOST_DESKTOP_TYPE_ASH) 34 ui::HOST_DESKTOP_TYPE_ASH)
35 ShowAndFocusNativeWindowAura(window); 35 ShowAndFocusNativeWindowAura(window);
36 window->Show(); 36 window->Show();
37 // Always make sure the window hosting ash is visible and focused. 37 // Always make sure the window hosting ash is visible and focused.
38 HWND hwnd = window->GetHost()->GetAcceleratedWidget(); 38 HWND hwnd = window->GetHost()->GetAcceleratedWidget();
39 39
40 ::ShowWindow(hwnd, SW_SHOW); 40 ::ShowWindow(hwnd, SW_SHOW);
41 41
42 if (GetForegroundWindow() != hwnd) { 42 if (GetForegroundWindow() != hwnd) {
43 VLOG(1) << "Forcefully refocusing front window"; 43 VLOG(1) << "Forcefully refocusing front window";
44 ui::ForegroundHelper::SetForeground(hwnd); 44 ui::ForegroundHelper::SetForeground(hwnd);
(...skipping 21 matching lines...) Expand all
66 } 66 }
67 } 67 }
68 GetWindowText(foreground_window, window_title, arraysize(window_title)); 68 GetWindowText(foreground_window, window_title, arraysize(window_title));
69 LOG(ERROR) << "ShowAndFocusNativeWindow failed. foreground window: " 69 LOG(ERROR) << "ShowAndFocusNativeWindow failed. foreground window: "
70 << foreground_window << ", title: " << window_title << ", path: " 70 << foreground_window << ", title: " << window_title << ", path: "
71 << path_str; 71 << path_str;
72 return false; 72 return false;
73 } 73 }
74 74
75 } // namespace ui_test_utils 75 } // namespace ui_test_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698