| OLD | NEW |
| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <tuple> | 7 #include <tuple> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 #include "third_party/WebKit/public/web/WebView.h" | 81 #include "third_party/WebKit/public/web/WebView.h" |
| 82 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 82 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
| 83 #include "ui/events/event.h" | 83 #include "ui/events/event.h" |
| 84 #include "ui/events/keycodes/keyboard_codes.h" | 84 #include "ui/events/keycodes/keyboard_codes.h" |
| 85 #include "ui/gfx/codec/jpeg_codec.h" | 85 #include "ui/gfx/codec/jpeg_codec.h" |
| 86 #include "ui/gfx/range/range.h" | 86 #include "ui/gfx/range/range.h" |
| 87 #include "ui/native_theme/native_theme_switches.h" | 87 #include "ui/native_theme/native_theme_switches.h" |
| 88 | 88 |
| 89 #if defined(USE_AURA) && defined(USE_X11) | 89 #if defined(USE_AURA) && defined(USE_X11) |
| 90 #include <X11/Xlib.h> | 90 #include <X11/Xlib.h> |
| 91 #include "base/memory/ptr_util.h" |
| 91 #include "ui/events/event_constants.h" | 92 #include "ui/events/event_constants.h" |
| 92 #include "ui/events/keycodes/keyboard_code_conversion.h" | 93 #include "ui/events/keycodes/keyboard_code_conversion.h" |
| 93 #include "ui/events/test/events_test_utils.h" | 94 #include "ui/events/test/events_test_utils.h" |
| 94 #include "ui/events/test/events_test_utils_x11.h" | 95 #include "ui/events/test/events_test_utils_x11.h" |
| 95 #endif | 96 #endif |
| 96 | 97 |
| 97 #if defined(USE_OZONE) | 98 #if defined(USE_OZONE) |
| 98 #include "ui/events/keycodes/keyboard_code_conversion.h" | 99 #include "ui/events/keycodes/keyboard_code_conversion.h" |
| 99 #endif | 100 #endif |
| 100 | 101 |
| (...skipping 2450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2551 ExpectPauseAndResume(3); | 2552 ExpectPauseAndResume(3); |
| 2552 blink::WebScriptSource source2( | 2553 blink::WebScriptSource source2( |
| 2553 WebString::fromUTF8("function func2() { func1(); }; func2();")); | 2554 WebString::fromUTF8("function func2() { func1(); }; func2();")); |
| 2554 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); | 2555 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); |
| 2555 | 2556 |
| 2556 EXPECT_FALSE(IsPaused()); | 2557 EXPECT_FALSE(IsPaused()); |
| 2557 Detach(); | 2558 Detach(); |
| 2558 } | 2559 } |
| 2559 | 2560 |
| 2560 } // namespace content | 2561 } // namespace content |
| OLD | NEW |