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

Side by Side Diff: chrome/test/ui_test_utils_linux.cc

Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui_test_utils.cc ('k') | chrome/test/ui_test_utils_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/browser.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/automation/ui_controls.h" 13 #include "chrome/browser/gtk/view_id_util.h"
14 #include "chrome/browser/ui/browser.h"
14 #if defined(TOOLKIT_VIEWS) 15 #if defined(TOOLKIT_VIEWS)
15 #include "chrome/browser/views/frame/browser_view.h" 16 #include "chrome/browser/views/frame/browser_view.h"
16 #include "views/focus/focus_manager.h" 17 #include "views/focus/focus_manager.h"
17 #endif 18 #endif
18 19
19 #include "chrome/browser/gtk/view_id_util.h"
20
21 namespace ui_test_utils { 20 namespace ui_test_utils {
22 21
23 #if !defined(TOOLKIT_VIEWS) 22 #if !defined(TOOLKIT_VIEWS)
24 namespace { 23 namespace {
25 24
26 // Check if the focused widget for |root| is |target| or a child of |target|. 25 // Check if the focused widget for |root| is |target| or a child of |target|.
27 static bool IsWidgetInFocusChain(GtkWidget* root, GtkWidget* target) { 26 static bool IsWidgetInFocusChain(GtkWidget* root, GtkWidget* target) {
28 GtkWidget* iter = root; 27 GtkWidget* iter = root;
29 28
30 while (iter) { 29 while (iter) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 86
88 void HideNativeWindow(gfx::NativeWindow window) { 87 void HideNativeWindow(gfx::NativeWindow window) {
89 gtk_widget_hide(GTK_WIDGET(window)); 88 gtk_widget_hide(GTK_WIDGET(window));
90 } 89 }
91 90
92 void ShowAndFocusNativeWindow(gfx::NativeWindow window) { 91 void ShowAndFocusNativeWindow(gfx::NativeWindow window) {
93 gtk_window_present(GTK_WINDOW(window)); 92 gtk_window_present(GTK_WINDOW(window));
94 } 93 }
95 94
96 } // namespace ui_test_utils 95 } // namespace ui_test_utils
OLDNEW
« no previous file with comments | « chrome/test/ui_test_utils.cc ('k') | chrome/test/ui_test_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698