| 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 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
| 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 bool is_threaded_animation_enabled_; | 664 bool is_threaded_animation_enabled_; |
| 665 | 665 |
| 666 class PendingFrameCreate : public base::RefCounted<PendingFrameCreate> { | 666 class PendingFrameCreate : public base::RefCounted<PendingFrameCreate> { |
| 667 public: | 667 public: |
| 668 PendingFrameCreate(int routing_id, | 668 PendingFrameCreate(int routing_id, |
| 669 mojom::FrameRequest frame_request, | 669 mojom::FrameRequest frame_request, |
| 670 mojom::FrameHostPtr frame_host); | 670 mojom::FrameHostPtr frame_host); |
| 671 | 671 |
| 672 mojom::FrameRequest TakeFrameRequest() { return std::move(frame_request_); } | 672 mojom::FrameRequest TakeFrameRequest() { return std::move(frame_request_); } |
| 673 mojom::FrameHostPtr TakeFrameHost() { | 673 mojom::FrameHostPtr TakeFrameHost() { |
| 674 frame_host_.set_connection_error_handler(base::Closure()); | 674 frame_host_.set_connection_error_handler(mojo::Closure()); |
| 675 return std::move(frame_host_); | 675 return std::move(frame_host_); |
| 676 } | 676 } |
| 677 | 677 |
| 678 private: | 678 private: |
| 679 friend class base::RefCounted<PendingFrameCreate>; | 679 friend class base::RefCounted<PendingFrameCreate>; |
| 680 | 680 |
| 681 ~PendingFrameCreate(); | 681 ~PendingFrameCreate(); |
| 682 | 682 |
| 683 // Mojo error handler. | 683 // Mojo error handler. |
| 684 void OnConnectionError(); | 684 void OnConnectionError(); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 699 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); | 699 DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
| 700 }; | 700 }; |
| 701 | 701 |
| 702 #if defined(COMPILER_MSVC) | 702 #if defined(COMPILER_MSVC) |
| 703 #pragma warning(pop) | 703 #pragma warning(pop) |
| 704 #endif | 704 #endif |
| 705 | 705 |
| 706 } // namespace content | 706 } // namespace content |
| 707 | 707 |
| 708 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ | 708 #endif // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_ |
| OLD | NEW |