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

Side by Side Diff: chrome/browser/ui/tests/browser_uitest.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | 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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
11 #include "base/test/test_file_util.h" 11 #include "base/test/test_file_util.h"
12 #include "base/test/test_timeouts.h" 12 #include "base/test/test_timeouts.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/platform_util.h" 15 #include "chrome/browser/platform_util.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/chrome_constants.h" 18 #include "chrome/common/chrome_constants.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/test/automation/browser_proxy.h" 20 #include "chrome/test/automation/browser_proxy.h"
21 #include "chrome/test/automation/tab_proxy.h" 21 #include "chrome/test/automation/tab_proxy.h"
22 #include "chrome/test/automation/window_proxy.h" 22 #include "chrome/test/automation/window_proxy.h"
23 #include "chrome/test/ui/ui_test.h" 23 #include "chrome/test/ui/ui_test.h"
24 #include "gfx/native_widget_types.h"
25 #include "grit/chromium_strings.h" 24 #include "grit/chromium_strings.h"
26 #include "grit/generated_resources.h" 25 #include "grit/generated_resources.h"
27 #include "net/base/net_util.h" 26 #include "net/base/net_util.h"
28 #include "net/test/test_server.h" 27 #include "net/test/test_server.h"
28 #include "ui/gfx/native_widget_types.h"
29 29
30 namespace { 30 namespace {
31 31
32 class BrowserTest : public UITest { 32 class BrowserTest : public UITest {
33 }; 33 };
34 34
35 class VisibleBrowserTest : public UITest { 35 class VisibleBrowserTest : public UITest {
36 protected: 36 protected:
37 VisibleBrowserTest() : UITest() { 37 VisibleBrowserTest() : UITest() {
38 show_window_ = true; 38 show_window_ = true;
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 EXPECT_EQ(0, window_count); 384 EXPECT_EQ(0, window_count);
385 385
386 // Starting a browser window should work just fine. 386 // Starting a browser window should work just fine.
387 ASSERT_TRUE(IsBrowserRunning()); 387 ASSERT_TRUE(IsBrowserRunning());
388 ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true)); 388 ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true));
389 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); 389 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
390 EXPECT_EQ(1, window_count); 390 EXPECT_EQ(1, window_count);
391 } 391 }
392 392
393 } // namespace 393 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/tabs/dock_info_unittest.cc ('k') | chrome/browser/ui/touch/frame/touch_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698