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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
679 // currently focused frame. | 679 // currently focused frame. |
680 void SelectRange(const gfx::Point& base, const gfx::Point& extent); | 680 void SelectRange(const gfx::Point& base, const gfx::Point& extent); |
681 | 681 |
682 // Notifies the main frame that it can continue navigation (if it was deferred | 682 // Notifies the main frame that it can continue navigation (if it was deferred |
683 // immediately at first response). | 683 // immediately at first response). |
684 void ResumeResponseDeferredAtStart(); | 684 void ResumeResponseDeferredAtStart(); |
685 | 685 |
686 // Forces overscroll to be disabled (used by touch emulation). | 686 // Forces overscroll to be disabled (used by touch emulation). |
687 void SetForceDisableOverscrollContent(bool force_disable); | 687 void SetForceDisableOverscrollContent(bool force_disable); |
688 | 688 |
689 #if defined(OS_ANDROID) | |
690 void ResumeLoadingCreatedWebContents(); | |
jam
2015/04/20 16:05:41
nit: add comment and put it in the other android i
Maria
2015/04/20 23:40:07
Done.
| |
691 #endif | |
692 | |
689 AudioStateProvider* audio_state_provider() { | 693 AudioStateProvider* audio_state_provider() { |
690 return audio_state_provider_.get(); | 694 return audio_state_provider_.get(); |
691 } | 695 } |
692 | 696 |
693 bool has_audio_power_save_blocker_for_testing() const { | 697 bool has_audio_power_save_blocker_for_testing() const { |
694 return audio_power_save_blocker_; | 698 return audio_power_save_blocker_; |
695 } | 699 } |
696 | 700 |
697 bool has_video_power_save_blocker_for_testing() const { | 701 bool has_video_power_save_blocker_for_testing() const { |
698 return video_power_save_blocker_; | 702 return video_power_save_blocker_; |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
910 | 914 |
911 // Finds the new RenderWidgetHost and returns it. Note that this can only be | 915 // Finds the new RenderWidgetHost and returns it. Note that this can only be |
912 // called once as this call also removes it from the internal map. | 916 // called once as this call also removes it from the internal map. |
913 RenderWidgetHostView* GetCreatedWidget(int route_id); | 917 RenderWidgetHostView* GetCreatedWidget(int route_id); |
914 | 918 |
915 // Finds the new WebContentsImpl by route_id, initializes it for | 919 // Finds the new WebContentsImpl by route_id, initializes it for |
916 // renderer-initiated creation, and returns it. Note that this can only be | 920 // renderer-initiated creation, and returns it. Note that this can only be |
917 // called once as this call also removes it from the internal map. | 921 // called once as this call also removes it from the internal map. |
918 WebContentsImpl* GetCreatedWindow(int route_id); | 922 WebContentsImpl* GetCreatedWindow(int route_id); |
919 | 923 |
924 // Resume blocked requests for both the RenderViewHost and RenderFrameHost. | |
925 void ResumeRequestsForCreatedWindow(WebContentsImpl& new_contents); | |
926 | |
920 // Tracking loading progress ------------------------------------------------- | 927 // Tracking loading progress ------------------------------------------------- |
921 | 928 |
922 // Resets the tracking state of the current load. | 929 // Resets the tracking state of the current load. |
923 void ResetLoadProgressState(); | 930 void ResetLoadProgressState(); |
924 | 931 |
925 // Calculates the progress of the current load and notifies the delegate. | 932 // Calculates the progress of the current load and notifies the delegate. |
926 void SendLoadProgressChanged(); | 933 void SendLoadProgressChanged(); |
927 | 934 |
928 // Misc non-view stuff ------------------------------------------------------- | 935 // Misc non-view stuff ------------------------------------------------------- |
929 | 936 |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1288 // Adds/removes a callback called on creation of each new WebContents. | 1295 // Adds/removes a callback called on creation of each new WebContents. |
1289 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); | 1296 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); |
1290 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); | 1297 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); |
1291 | 1298 |
1292 DISALLOW_COPY_AND_ASSIGN(FriendZone); | 1299 DISALLOW_COPY_AND_ASSIGN(FriendZone); |
1293 }; | 1300 }; |
1294 | 1301 |
1295 } // namespace content | 1302 } // namespace content |
1296 | 1303 |
1297 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1304 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |