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

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

Issue 8771015: Rename Desktop->RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
OLDNEW
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/base/in_process_browser_test.h" 5 #include "chrome/test/base/in_process_browser_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/stack_trace.h" 9 #include "base/debug/stack_trace.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 27 matching lines...) Expand all
38 #include "net/base/mock_host_resolver.h" 38 #include "net/base/mock_host_resolver.h"
39 #include "net/test/test_server.h" 39 #include "net/test/test_server.h"
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "chrome/browser/chromeos/audio_handler.h" 42 #include "chrome/browser/chromeos/audio_handler.h"
43 #elif defined(OS_MACOSX) 43 #elif defined(OS_MACOSX)
44 #include "base/mac/scoped_nsautorelease_pool.h" 44 #include "base/mac/scoped_nsautorelease_pool.h"
45 #endif 45 #endif
46 46
47 #if defined(USE_AURA) 47 #if defined(USE_AURA)
48 #include "ui/aura/desktop.h" 48 #include "ui/aura/root_window.h"
49 #endif 49 #endif
50 50
51 namespace { 51 namespace {
52 52
53 // Passed as value of kTestType. 53 // Passed as value of kTestType.
54 const char kBrowserTestType[] = "browser"; 54 const char kBrowserTestType[] = "browser";
55 55
56 } // namespace 56 } // namespace
57 57
58 InProcessBrowserTest::InProcessBrowserTest() 58 InProcessBrowserTest::InProcessBrowserTest()
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 return; 325 return;
326 326
327 // Invoke CloseAllBrowsersAndMayExit on a running message loop. 327 // Invoke CloseAllBrowsersAndMayExit on a running message loop.
328 // CloseAllBrowsersAndMayExit exits the message loop after everything has been 328 // CloseAllBrowsersAndMayExit exits the message loop after everything has been
329 // shut down properly. 329 // shut down properly.
330 MessageLoopForUI::current()->PostTask(FROM_HERE, 330 MessageLoopForUI::current()->PostTask(FROM_HERE,
331 base::Bind(&BrowserList::AttemptExit, 331 base::Bind(&BrowserList::AttemptExit,
332 false)); 332 false));
333 ui_test_utils::RunMessageLoop(); 333 ui_test_utils::RunMessageLoop();
334 } 334 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698