| 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/test/ui_test_utils.h" | 5 #include "chrome/test/ui_test_utils.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| 11 #include "chrome/browser/automation/ui_controls.h" | 11 #include "chrome/browser/automation/ui_controls.h" |
| 12 #include "chrome/browser/browser_window.h" | 12 #include "chrome/browser/browser_window.h" |
| 13 #include "chrome/browser/gtk/view_id_util.h" | |
| 14 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 15 #if defined(TOOLKIT_VIEWS) | 15 #if defined(TOOLKIT_VIEWS) |
| 16 #include "chrome/browser/ui/views/frame/browser_view.h" | 16 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 17 #include "views/focus/focus_manager.h" | 17 #include "views/focus/focus_manager.h" |
| 18 #endif | 18 #endif |
| 19 | 19 |
| 20 namespace ui_test_utils { | 20 namespace ui_test_utils { |
| 21 | 21 |
| 22 #if !defined(TOOLKIT_VIEWS) | 22 #if !defined(TOOLKIT_VIEWS) |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 } | 89 } |
| 90 | 90 |
| 91 void ShowAndFocusNativeWindow(gfx::NativeWindow window) { | 91 void ShowAndFocusNativeWindow(gfx::NativeWindow window) { |
| 92 if (gtk_window_has_toplevel_focus(GTK_WINDOW(window))) | 92 if (gtk_window_has_toplevel_focus(GTK_WINDOW(window))) |
| 93 return; | 93 return; |
| 94 | 94 |
| 95 gtk_window_present(GTK_WINDOW(window)); | 95 gtk_window_present(GTK_WINDOW(window)); |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace ui_test_utils | 98 } // namespace ui_test_utils |
| OLD | NEW |