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

Side by Side Diff: Source/web/WebViewImpl.h

Issue 110183002: Remove #if ENABLE(NAVIGATOR_CONTENT_UTILS) from blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased #2 Created 6 years, 11 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 | « Source/web/ChromeClientImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
750 750
751 #if ENABLE(INPUT_SPEECH) 751 #if ENABLE(INPUT_SPEECH)
752 OwnPtr<SpeechInputClientImpl> m_speechInputClient; 752 OwnPtr<SpeechInputClientImpl> m_speechInputClient;
753 #endif 753 #endif
754 OwnPtr<SpeechRecognitionClientProxy> m_speechRecognitionClient; 754 OwnPtr<SpeechRecognitionClientProxy> m_speechRecognitionClient;
755 755
756 OwnPtr<GeolocationClientProxy> m_geolocationClientProxy; 756 OwnPtr<GeolocationClientProxy> m_geolocationClientProxy;
757 757
758 UserMediaClientImpl m_userMediaClientImpl; 758 UserMediaClientImpl m_userMediaClientImpl;
759 OwnPtr<MIDIClientProxy> m_midiClientProxy; 759 OwnPtr<MIDIClientProxy> m_midiClientProxy;
760 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
761 OwnPtr<NavigatorContentUtilsClientImpl> m_navigatorContentUtilsClient; 760 OwnPtr<NavigatorContentUtilsClientImpl> m_navigatorContentUtilsClient;
762 #endif
763 OwnPtr<WebActiveGestureAnimation> m_gestureAnimation; 761 OwnPtr<WebActiveGestureAnimation> m_gestureAnimation;
764 WebPoint m_positionOnFlingStart; 762 WebPoint m_positionOnFlingStart;
765 WebPoint m_globalPositionOnFlingStart; 763 WebPoint m_globalPositionOnFlingStart;
766 int m_flingModifier; 764 int m_flingModifier;
767 bool m_flingSourceDevice; 765 bool m_flingSourceDevice;
768 Vector<OwnPtr<LinkHighlight> > m_linkHighlights; 766 Vector<OwnPtr<LinkHighlight> > m_linkHighlights;
769 OwnPtr<ValidationMessageClientImpl> m_validationMessage; 767 OwnPtr<ValidationMessageClientImpl> m_validationMessage;
770 OwnPtr<FullscreenController> m_fullscreenController; 768 OwnPtr<FullscreenController> m_fullscreenController;
771 769
772 bool m_showFPSCounter; 770 bool m_showFPSCounter;
773 bool m_showPaintRects; 771 bool m_showPaintRects;
774 bool m_showDebugBorders; 772 bool m_showDebugBorders;
775 bool m_continuousPaintingEnabled; 773 bool m_continuousPaintingEnabled;
776 bool m_showScrollBottleneckRects; 774 bool m_showScrollBottleneckRects;
777 WebColor m_baseBackgroundColor; 775 WebColor m_baseBackgroundColor;
778 WebColor m_backgroundColorOverride; 776 WebColor m_backgroundColorOverride;
779 float m_zoomFactorOverride; 777 float m_zoomFactorOverride;
780 778
781 WebCore::Timer<WebViewImpl> m_helperPluginCloseTimer; 779 WebCore::Timer<WebViewImpl> m_helperPluginCloseTimer;
782 Vector<RefPtr<WebHelperPluginImpl> > m_helperPluginsPendingClose; 780 Vector<RefPtr<WebHelperPluginImpl> > m_helperPluginsPendingClose;
783 }; 781 };
784 782
785 // We have no ways to check if the specified WebView is an instance of 783 // We have no ways to check if the specified WebView is an instance of
786 // WebViewImpl because WebViewImpl is the only implementation of WebView. 784 // WebViewImpl because WebViewImpl is the only implementation of WebView.
787 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); 785 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true);
788 786
789 } // namespace blink 787 } // namespace blink
790 788
791 #endif 789 #endif
OLDNEW
« no previous file with comments | « Source/web/ChromeClientImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698