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

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

Issue 1014623002: Revert "Refactor sudden termination" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + fixed compilation error Created 5 years, 9 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/public/test/mock_render_process_host.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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 int identifier, 510 int identifier,
511 int match_index, 511 int match_index,
512 const blink::WebAXObject& start_object, 512 const blink::WebAXObject& start_object,
513 int start_offset, 513 int start_offset,
514 const blink::WebAXObject& end_object, 514 const blink::WebAXObject& end_object,
515 int end_offset); 515 int end_offset);
516 virtual void didChangeManifest(blink::WebLocalFrame*); 516 virtual void didChangeManifest(blink::WebLocalFrame*);
517 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*); 517 virtual void didChangeDefaultPresentation(blink::WebLocalFrame*);
518 virtual bool enterFullscreen(); 518 virtual bool enterFullscreen();
519 virtual bool exitFullscreen(); 519 virtual bool exitFullscreen();
520 virtual void suddenTerminationDisablerChanged(
521 bool present,
522 blink::WebFrameClient::SuddenTerminationDisablerType type);
523 virtual blink::WebPermissionClient* permissionClient(); 520 virtual blink::WebPermissionClient* permissionClient();
524 521
525 // WebMediaPlayerDelegate implementation: 522 // WebMediaPlayerDelegate implementation:
526 void DidPlay(blink::WebMediaPlayer* player) override; 523 void DidPlay(blink::WebMediaPlayer* player) override;
527 void DidPause(blink::WebMediaPlayer* player) override; 524 void DidPause(blink::WebMediaPlayer* player) override;
528 void PlayerGone(blink::WebMediaPlayer* player) override; 525 void PlayerGone(blink::WebMediaPlayer* player) override;
529 526
530 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move 527 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move
531 // this back to private member. 528 // this back to private member.
532 void OnNavigate(const CommonNavigationParams& common_params, 529 void OnNavigate(const CommonNavigationParams& common_params,
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 #endif 881 #endif
885 882
886 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 883 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
887 884
888 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 885 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
889 }; 886 };
890 887
891 } // namespace content 888 } // namespace content
892 889
893 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 890 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698