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

Side by Side Diff: chrome/test/plugin/pdf_browsertest.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/renderer_host/render_view_host.h" 11 #include "chrome/browser/renderer_host/render_view_host.h"
12 #include "chrome/browser/tab_contents/tab_contents.h" 12 #include "chrome/browser/tab_contents/tab_contents.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/window_sizer.h" 15 #include "chrome/browser/ui/window_sizer.h"
16 #include "chrome/common/chrome_paths.h" 16 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/notification_observer.h" 18 #include "chrome/common/notification_observer.h"
19 #include "chrome/common/notification_type.h" 19 #include "chrome/common/notification_type.h"
20 #include "chrome/test/in_process_browser_test.h" 20 #include "chrome/test/in_process_browser_test.h"
21 #include "chrome/test/ui_test_utils.h" 21 #include "chrome/test/ui_test_utils.h"
22 #include "gfx/codec/png_codec.h"
23 #include "net/test/test_server.h" 22 #include "net/test/test_server.h"
24 #include "ui/base/clipboard/clipboard.h" 23 #include "ui/base/clipboard/clipboard.h"
24 #include "ui/gfx/codec/png_codec.h"
25 25
26 extern base::hash_map<std::string, int> g_test_timeout_overrides; 26 extern base::hash_map<std::string, int> g_test_timeout_overrides;
27 27
28 namespace { 28 namespace {
29 29
30 // Include things like browser frame and scrollbar and make sure we're bigger 30 // Include things like browser frame and scrollbar and make sure we're bigger
31 // than the test pdf document. 31 // than the test pdf document.
32 static const int kBrowserWidth = 1000; 32 static const int kBrowserWidth = 1000;
33 static const int kBrowserHeight = 600; 33 static const int kBrowserHeight = 600;
34 static const int kLoadingTestTimeoutMs = 60000; 34 static const int kLoadingTestTimeoutMs = 60000;
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // Check if the LOAD_STOP notification could have come while we run a 333 // Check if the LOAD_STOP notification could have come while we run a
334 // nested message loop for the JS call. 334 // nested message loop for the JS call.
335 if (last_count != load_stop_notification_count()) 335 if (last_count != load_stop_notification_count())
336 continue; 336 continue;
337 ui_test_utils::WaitForLoadStop(controller); 337 ui_test_utils::WaitForLoadStop(controller);
338 } 338 }
339 } 339 }
340 } 340 }
341 341
342 } // namespace 342 } // namespace
OLDNEW
« no previous file with comments | « chrome/test/live_sync/live_bookmarks_sync_test.h ('k') | chrome/test/startup/feature_startup_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698