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

Side by Side Diff: components/html_viewer/html_frame.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
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 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "cc/layers/surface_layer.h" 13 #include "cc/layers/surface_layer.h"
14 #include "components/html_viewer/html_frame_tree_manager.h" 14 #include "components/html_viewer/html_frame_tree_manager.h"
15 #include "components/html_viewer/replicated_frame_state.h" 15 #include "components/html_viewer/replicated_frame_state.h"
16 #include "components/mus/public/cpp/window_observer.h" 16 #include "components/mus/public/cpp/window_observer.h"
17 #include "components/web_view/public/interfaces/frame.mojom.h" 17 #include "components/web_view/public/interfaces/frame.mojom.h"
18 #include "mojo/public/cpp/bindings/binding.h"
18 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" 19 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
19 #include "third_party/WebKit/public/platform/WebURLRequest.h" 20 #include "third_party/WebKit/public/platform/WebURLRequest.h"
20 #include "third_party/WebKit/public/web/WebFrameClient.h" 21 #include "third_party/WebKit/public/web/WebFrameClient.h"
21 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h" 22 #include "third_party/WebKit/public/web/WebRemoteFrameClient.h"
22 #include "third_party/WebKit/public/web/WebSandboxFlags.h" 23 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
23 #include "third_party/WebKit/public/web/WebTextInputInfo.h" 24 #include "third_party/WebKit/public/web/WebTextInputInfo.h"
24 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
25 25
26 namespace cc_blink { 26 namespace cc_blink {
27 class WebLayerImpl; 27 class WebLayerImpl;
28 } 28 }
29 29
30 namespace blink { 30 namespace blink {
31 class WebFrame; 31 class WebFrame;
32 class WebWidget; 32 class WebWidget;
33 } 33 }
34 34
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 base::TimeTicks navigation_start_time_; 370 base::TimeTicks navigation_start_time_;
371 371
372 base::WeakPtrFactory<HTMLFrame> weak_factory_; 372 base::WeakPtrFactory<HTMLFrame> weak_factory_;
373 373
374 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); 374 DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
375 }; 375 };
376 376
377 } // namespace html_viewer 377 } // namespace html_viewer
378 378
379 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ 379 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_
OLDNEW
« no previous file with comments | « components/html_viewer/html_document_application_delegate.h ('k') | components/html_viewer/html_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698