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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Call delegate() directly from NavigationControllerAndroid Created 4 years, 8 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
OLDNEW
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <functional> 10 #include <functional>
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 const MediaStreamRequest& request, 505 const MediaStreamRequest& request,
506 const MediaResponseCallback& callback) override; 506 const MediaResponseCallback& callback) override;
507 bool CheckMediaAccessPermission(const GURL& security_origin, 507 bool CheckMediaAccessPermission(const GURL& security_origin,
508 MediaStreamType type) override; 508 MediaStreamType type) override;
509 SessionStorageNamespace* GetSessionStorageNamespace( 509 SessionStorageNamespace* GetSessionStorageNamespace(
510 SiteInstance* instance) override; 510 SiteInstance* instance) override;
511 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override; 511 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override;
512 FrameTree* GetFrameTree() override; 512 FrameTree* GetFrameTree() override;
513 void SetIsVirtualKeyboardRequested(bool requested) override; 513 void SetIsVirtualKeyboardRequested(bool requested) override;
514 bool IsVirtualKeyboardRequested() override; 514 bool IsVirtualKeyboardRequested() override;
515 bool IsOverridingUserAgent() override;
515 516
516 // NavigatorDelegate --------------------------------------------------------- 517 // NavigatorDelegate ---------------------------------------------------------
517 518
518 void DidStartNavigation(NavigationHandle* navigation_handle) override; 519 void DidStartNavigation(NavigationHandle* navigation_handle) override;
519 void DidRedirectNavigation(NavigationHandle* navigation_handle) override; 520 void DidRedirectNavigation(NavigationHandle* navigation_handle) override;
520 void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override; 521 void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override;
521 void DidFinishNavigation(NavigationHandle* navigation_handle) override; 522 void DidFinishNavigation(NavigationHandle* navigation_handle) override;
522 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, 523 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host,
523 const GURL& validated_url, 524 const GURL& validated_url,
524 bool is_error_page, 525 bool is_error_page,
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 void RenderFrameForInterstitialPageCreated( 691 void RenderFrameForInterstitialPageCreated(
691 RenderFrameHost* render_frame_host) override; 692 RenderFrameHost* render_frame_host) override;
692 693
693 // Sets the passed interstitial as the currently showing interstitial. 694 // Sets the passed interstitial as the currently showing interstitial.
694 // No interstitial page should already be attached. 695 // No interstitial page should already be attached.
695 void AttachInterstitialPage(InterstitialPageImpl* interstitial_page) override; 696 void AttachInterstitialPage(InterstitialPageImpl* interstitial_page) override;
696 697
697 // Unsets the currently showing interstitial. 698 // Unsets the currently showing interstitial.
698 void DetachInterstitialPage() override; 699 void DetachInterstitialPage() override;
699 700
701 void UpdateOverridingUserAgent() override;
702
700 // Unpause the throbber if it was paused. 703 // Unpause the throbber if it was paused.
701 void DidProceedOnInterstitial() override; 704 void DidProceedOnInterstitial() override;
702 705
703 typedef base::Callback<void(WebContents*)> CreatedCallback; 706 typedef base::Callback<void(WebContents*)> CreatedCallback;
704 707
705 // Forces overscroll to be disabled (used by touch emulation). 708 // Forces overscroll to be disabled (used by touch emulation).
706 void SetForceDisableOverscrollContent(bool force_disable); 709 void SetForceDisableOverscrollContent(bool force_disable);
707 710
708 AudioStreamMonitor* audio_stream_monitor() { 711 AudioStreamMonitor* audio_stream_monitor() {
709 return &audio_stream_monitor_; 712 return &audio_stream_monitor_;
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 // Adds/removes a callback called on creation of each new WebContents. 1346 // Adds/removes a callback called on creation of each new WebContents.
1344 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1347 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1345 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1348 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1346 1349
1347 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1350 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1348 }; 1351 };
1349 1352
1350 } // namespace content 1353 } // namespace content
1351 1354
1352 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1355 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698