OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "core/loader/EmptyClients.h" | 38 #include "core/loader/EmptyClients.h" |
39 #include "public/platform/ServiceProvider.h" | 39 #include "public/platform/ServiceProvider.h" |
40 #include "wtf/Assertions.h" | 40 #include "wtf/Assertions.h" |
41 | 41 |
42 namespace blink { | 42 namespace blink { |
43 namespace { | 43 namespace { |
44 | 44 |
45 class DummyServiceProvider : public blink::ServiceProvider { | 45 class DummyServiceProvider : public blink::ServiceProvider { |
46 public: | 46 public: |
47 mojo::NavigatorHost* NavigatorHost() { return 0; } | 47 mojo::NavigatorHost* NavigatorHost() { return 0; } |
| 48 mojo::Shell* Shell() { return 0; } |
48 }; | 49 }; |
49 | 50 |
50 } | 51 } |
51 | 52 |
52 PassOwnPtr<DummyPageHolder> DummyPageHolder::create( | 53 PassOwnPtr<DummyPageHolder> DummyPageHolder::create( |
53 const IntSize& initialViewSize, | 54 const IntSize& initialViewSize, |
54 Page::PageClients* pageClients, | 55 Page::PageClients* pageClients, |
55 PassOwnPtr<FrameLoaderClient> frameLoaderClient) { | 56 PassOwnPtr<FrameLoaderClient> frameLoaderClient) { |
56 return adoptPtr(new DummyPageHolder(initialViewSize, pageClients, frameLoade
rClient)); | 57 return adoptPtr(new DummyPageHolder(initialViewSize, pageClients, frameLoade
rClient)); |
57 } | 58 } |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 { | 113 { |
113 return *m_frame->view(); | 114 return *m_frame->view(); |
114 } | 115 } |
115 | 116 |
116 Document& DummyPageHolder::document() const | 117 Document& DummyPageHolder::document() const |
117 { | 118 { |
118 return *m_frame->domWindow()->document(); | 119 return *m_frame->domWindow()->document(); |
119 } | 120 } |
120 | 121 |
121 } // namespace blink | 122 } // namespace blink |
OLD | NEW |