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

Side by Side Diff: content/public/test/browser_test_utils.cc

Issue 530623002: Use qualified path for three more grit headers from ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ui_resources too Created 6 years, 3 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
« no previous file with comments | « content/common/cursors/DEPS ('k') | content/test/webui_resource_browsertest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/test/browser_test_utils.h" 5 #include "content/public/test/browser_test_utils.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/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/browser/dom_operation_notification_details.h" 22 #include "content/public/browser/dom_operation_notification_details.h"
23 #include "content/public/browser/histogram_fetcher.h" 23 #include "content/public/browser/histogram_fetcher.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/notification_types.h" 25 #include "content/public/browser/notification_types.h"
26 #include "content/public/browser/render_frame_host.h" 26 #include "content/public/browser/render_frame_host.h"
27 #include "content/public/browser/render_process_host.h" 27 #include "content/public/browser/render_process_host.h"
28 #include "content/public/browser/render_view_host.h" 28 #include "content/public/browser/render_view_host.h"
29 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/browser/web_contents_observer.h" 30 #include "content/public/browser/web_contents_observer.h"
31 #include "content/public/test/test_utils.h" 31 #include "content/public/test/test_utils.h"
32 #include "grit/webui_resources.h"
33 #include "net/base/filename_util.h" 32 #include "net/base/filename_util.h"
34 #include "net/cookies/cookie_store.h" 33 #include "net/cookies/cookie_store.h"
35 #include "net/test/python_utils.h" 34 #include "net/test/python_utils.h"
36 #include "net/url_request/url_request_context.h" 35 #include "net/url_request/url_request_context.h"
37 #include "net/url_request/url_request_context_getter.h" 36 #include "net/url_request/url_request_context_getter.h"
38 #include "testing/gtest/include/gtest/gtest.h" 37 #include "testing/gtest/include/gtest/gtest.h"
39 #include "ui/base/resource/resource_bundle.h" 38 #include "ui/base/resource/resource_bundle.h"
40 #include "ui/compositor/test/draw_waiter_for_test.h" 39 #include "ui/compositor/test/draw_waiter_for_test.h"
41 #include "ui/events/gestures/gesture_configuration.h" 40 #include "ui/events/gestures/gesture_configuration.h"
42 #include "ui/events/keycodes/dom4/keycode_converter.h" 41 #include "ui/events/keycodes/dom4/keycode_converter.h"
42 #include "ui/resources/grit/webui_resources.h"
43 43
44 #if defined(USE_AURA) 44 #if defined(USE_AURA)
45 #include "ui/aura/test/window_event_dispatcher_test_api.h" 45 #include "ui/aura/test/window_event_dispatcher_test_api.h"
46 #include "ui/aura/window.h" 46 #include "ui/aura/window.h"
47 #include "ui/aura/window_event_dispatcher.h" 47 #include "ui/aura/window_event_dispatcher.h"
48 #include "ui/aura/window_tree_host.h" 48 #include "ui/aura/window_tree_host.h"
49 #endif // USE_AURA 49 #endif // USE_AURA
50 50
51 namespace content { 51 namespace content {
52 namespace { 52 namespace {
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 } 726 }
727 // The queue should not be empty, unless we were quit because of a timeout. 727 // The queue should not be empty, unless we were quit because of a timeout.
728 if (message_queue_.empty()) 728 if (message_queue_.empty())
729 return false; 729 return false;
730 *message = message_queue_.front(); 730 *message = message_queue_.front();
731 message_queue_.pop(); 731 message_queue_.pop();
732 return true; 732 return true;
733 } 733 }
734 734
735 } // namespace content 735 } // namespace content
OLDNEW
« no previous file with comments | « content/common/cursors/DEPS ('k') | content/test/webui_resource_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698