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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: oops, clumsy Created 4 years, 10 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/renderer/mojo_context_state.cc ('k') | content/renderer/render_frame_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 // Expose MediaPermission to the non-UI threads. Any calls to this will be 647 // Expose MediaPermission to the non-UI threads. Any calls to this will be
648 // redirected to |media_permission_dispatcher_| on UI thread and have the 648 // redirected to |media_permission_dispatcher_| on UI thread and have the
649 // callback called on |caller_task_runner|. 649 // callback called on |caller_task_runner|.
650 scoped_ptr<media::MediaPermission> CreateMediaPermissionProxy( 650 scoped_ptr<media::MediaPermission> CreateMediaPermissionProxy(
651 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner); 651 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner);
652 652
653 // Sends the current frame's navigation state to the browser. 653 // Sends the current frame's navigation state to the browser.
654 void SendUpdateState(); 654 void SendUpdateState();
655 655
656 // Creates a MojoBindingsController to allow WebUI documents to communicate 656 // Creates a MojoBindingsController to allow WebUI documents to communicate
657 // with the browser process. 657 // with the browser process. If |for_layout_tests| is true, the module system
658 void EnableMojoBindings(); 658 // is exposed on a global "mojo" object rather than "define".
659 void EnableMojoBindings(bool for_layout_tests);
659 660
660 protected: 661 protected:
661 explicit RenderFrameImpl(const CreateParams& params); 662 explicit RenderFrameImpl(const CreateParams& params);
662 663
663 private: 664 private:
664 friend class RenderFrameImplTest; 665 friend class RenderFrameImplTest;
665 friend class RenderFrameObserver; 666 friend class RenderFrameObserver;
666 friend class RendererAccessibilityTest; 667 friend class RendererAccessibilityTest;
667 friend class TestRenderFrame; 668 friend class TestRenderFrame;
668 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); 669 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem);
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1196 #endif 1197 #endif
1197 1198
1198 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1199 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1199 1200
1200 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1201 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1201 }; 1202 };
1202 1203
1203 } // namespace content 1204 } // namespace content
1204 1205
1205 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1206 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/mojo_context_state.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698