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

Side by Side Diff: components/web_view/frame_apptest.cc

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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 | « components/web_view/frame.cc ('k') | components/web_view/frame_connection.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/web_view/frame.h" 5 #include "components/web_view/frame.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "base/test/test_timeouts.h" 16 #include "base/test/test_timeouts.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "components/mus/public/cpp/window_observer.h" 19 #include "components/mus/public/cpp/window_observer.h"
20 #include "components/mus/public/cpp/window_tree_connection.h" 20 #include "components/mus/public/cpp/window_tree_connection.h"
21 #include "components/mus/public/cpp/window_tree_delegate.h" 21 #include "components/mus/public/cpp/window_tree_delegate.h"
22 #include "components/mus/public/cpp/window_tree_host_factory.h" 22 #include "components/mus/public/cpp/window_tree_host_factory.h"
23 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 23 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
24 #include "components/web_view/frame_connection.h" 24 #include "components/web_view/frame_connection.h"
25 #include "components/web_view/frame_tree.h" 25 #include "components/web_view/frame_tree.h"
26 #include "components/web_view/frame_tree_delegate.h" 26 #include "components/web_view/frame_tree_delegate.h"
27 #include "components/web_view/frame_user_data.h" 27 #include "components/web_view/frame_user_data.h"
28 #include "components/web_view/test_frame_tree_delegate.h" 28 #include "components/web_view/test_frame_tree_delegate.h"
29 #include "mojo/application/public/cpp/application_connection.h" 29 #include "mojo/shell/public/cpp/application_connection.h"
30 #include "mojo/application/public/cpp/application_delegate.h" 30 #include "mojo/shell/public/cpp/application_delegate.h"
31 #include "mojo/application/public/cpp/application_impl.h" 31 #include "mojo/shell/public/cpp/application_impl.h"
32 #include "mojo/application/public/cpp/application_test_base.h" 32 #include "mojo/shell/public/cpp/application_test_base.h"
33 #include "mojo/application/public/cpp/service_provider_impl.h" 33 #include "mojo/shell/public/cpp/service_provider_impl.h"
34 34
35 using mus::Window; 35 using mus::Window;
36 using mus::WindowTreeConnection; 36 using mus::WindowTreeConnection;
37 37
38 namespace web_view { 38 namespace web_view {
39 39
40 namespace { 40 namespace {
41 41
42 base::RunLoop* current_run_loop = nullptr; 42 base::RunLoop* current_run_loop = nullptr;
43 43
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1); 578 base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1);
579 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame = 579 scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
580 NavigateFrameWithStartTime(child_view_and_frame.get(), 580 NavigateFrameWithStartTime(child_view_and_frame.get(),
581 navigation_start_time); 581 navigation_start_time);
582 EXPECT_EQ(navigation_start_time, 582 EXPECT_EQ(navigation_start_time,
583 navigated_child_view_and_frame->test_frame_client() 583 navigated_child_view_and_frame->test_frame_client()
584 ->last_navigation_start_time()); 584 ->last_navigation_start_time());
585 } 585 }
586 586
587 } // namespace web_view 587 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/frame.cc ('k') | components/web_view/frame_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698