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

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

Issue 1948343002: [reland] Browser Side Text Input State Tracking for OOPIF (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed Public Test API Methods to non-const Created 4 years, 6 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 class PluginContentOriginWhitelist; 66 class PluginContentOriginWhitelist;
67 class PowerSaveBlocker; 67 class PowerSaveBlocker;
68 class RenderViewHost; 68 class RenderViewHost;
69 class RenderViewHostDelegateView; 69 class RenderViewHostDelegateView;
70 class RenderWidgetHostImpl; 70 class RenderWidgetHostImpl;
71 class RenderWidgetHostInputEventRouter; 71 class RenderWidgetHostInputEventRouter;
72 class SavePackage; 72 class SavePackage;
73 class ScreenOrientationDispatcherHost; 73 class ScreenOrientationDispatcherHost;
74 class SiteInstance; 74 class SiteInstance;
75 class TestWebContents; 75 class TestWebContents;
76 class TextInputManager;
76 class WakeLockServiceContext; 77 class WakeLockServiceContext;
77 class WebContentsAudioMuter; 78 class WebContentsAudioMuter;
78 class WebContentsDelegate; 79 class WebContentsDelegate;
79 class WebContentsImpl; 80 class WebContentsImpl;
80 class WebContentsView; 81 class WebContentsView;
81 class WebContentsViewDelegate; 82 class WebContentsViewDelegate;
82 struct AXEventNotificationDetails; 83 struct AXEventNotificationDetails;
83 struct ColorSuggestion; 84 struct ColorSuggestion;
84 struct FaviconURL; 85 struct FaviconURL;
85 struct LoadNotificationDetails; 86 struct LoadNotificationDetails;
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 bool IsFullscreenForCurrentTab( 624 bool IsFullscreenForCurrentTab(
624 RenderWidgetHostImpl* render_widget_host) const override; 625 RenderWidgetHostImpl* render_widget_host) const override;
625 blink::WebDisplayMode GetDisplayMode( 626 blink::WebDisplayMode GetDisplayMode(
626 RenderWidgetHostImpl* render_widget_host) const override; 627 RenderWidgetHostImpl* render_widget_host) const override;
627 void LostCapture(RenderWidgetHostImpl* render_widget_host) override; 628 void LostCapture(RenderWidgetHostImpl* render_widget_host) override;
628 void LostMouseLock(RenderWidgetHostImpl* render_widget_host) override; 629 void LostMouseLock(RenderWidgetHostImpl* render_widget_host) override;
629 void ForwardCompositorProto(RenderWidgetHostImpl* render_widget_host, 630 void ForwardCompositorProto(RenderWidgetHostImpl* render_widget_host,
630 const std::vector<uint8_t>& proto) override; 631 const std::vector<uint8_t>& proto) override;
631 void OnRenderFrameProxyVisibilityChanged(bool visible) override; 632 void OnRenderFrameProxyVisibilityChanged(bool visible) override;
632 void SendScreenRects() override; 633 void SendScreenRects() override;
634 TextInputManager* GetTextInputManager() override;
633 635
634 // RenderFrameHostManager::Delegate ------------------------------------------ 636 // RenderFrameHostManager::Delegate ------------------------------------------
635 637
636 bool CreateRenderViewForRenderManager( 638 bool CreateRenderViewForRenderManager(
637 RenderViewHost* render_view_host, 639 RenderViewHost* render_view_host,
638 int opener_frame_routing_id, 640 int opener_frame_routing_id,
639 int proxy_routing_id, 641 int proxy_routing_id,
640 const FrameReplicationState& replicated_frame_state) override; 642 const FrameReplicationState& replicated_frame_state) override;
641 void CreateRenderWidgetHostViewForRenderManager( 643 void CreateRenderWidgetHostViewForRenderManager(
642 RenderViewHost* render_view_host) override; 644 RenderViewHost* render_view_host) override;
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 1370
1369 // Manages media players, CDMs, and power save blockers for media. 1371 // Manages media players, CDMs, and power save blockers for media.
1370 std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_; 1372 std::unique_ptr<MediaWebContentsObserver> media_web_contents_observer_;
1371 1373
1372 std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_; 1374 std::unique_ptr<RenderWidgetHostInputEventRouter> rwh_input_event_router_;
1373 1375
1374 PageImportanceSignals page_importance_signals_; 1376 PageImportanceSignals page_importance_signals_;
1375 1377
1376 bool page_scale_factor_is_one_; 1378 bool page_scale_factor_is_one_;
1377 1379
1380 // The TextInputManager instance for WebContents. The manager will track the
Charlie Reis 2016/05/26 06:22:05 nit: TextInputManager tracks the IME-related... (D
EhsanK 2016/05/30 15:06:09 Acknowledged.
1381 // IME-related state for all the RenderWidgets on this tab. Only exists on the
1382 // outer WebContents and is automatically destroyed when a WebContents
Charlie Reis 2016/05/26 06:22:05 nit: outer-most
EhsanK 2016/05/30 15:06:09 Done. Put 'outermost' rather than 'outer-most' as
Charlie Reis 2016/06/02 22:03:29 Outermost is fine, thanks.
1383 // becomes inner WebContents by attaching to an outer WebContents. Then the
Charlie Reis 2016/05/26 06:22:05 nit: an inner
EhsanK 2016/05/30 15:06:08 Done.
1384 // IME-related state for RenderWidgetHost on the inner WebContents are tracked
Charlie Reis 2016/05/26 06:22:05 nit: RenderWidgetHosts nit: s/are/is/ (state ...
EhsanK 2016/05/30 15:06:09 Acknowledged.
1385 // by the TextInputManager in the outer WebContents.
1386 std::unique_ptr<TextInputManager> text_input_manager_;
1387
1378 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; 1388 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;
1379 base::WeakPtrFactory<WebContentsImpl> weak_factory_; 1389 base::WeakPtrFactory<WebContentsImpl> weak_factory_;
1380 1390
1381 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1391 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1382 }; 1392 };
1383 1393
1384 // Dangerous methods which should never be made part of the public API, so we 1394 // Dangerous methods which should never be made part of the public API, so we
1385 // grant their use only to an explicit friend list (c++ attorney/client idiom). 1395 // grant their use only to an explicit friend list (c++ attorney/client idiom).
1386 class CONTENT_EXPORT WebContentsImpl::FriendZone { 1396 class CONTENT_EXPORT WebContentsImpl::FriendZone {
1387 private: 1397 private:
1388 friend class TestNavigationObserver; 1398 friend class TestNavigationObserver;
1389 friend class WebContentsAddedObserver; 1399 friend class WebContentsAddedObserver;
1390 friend class ContentBrowserSanityChecker; 1400 friend class ContentBrowserSanityChecker;
1391 1401
1392 FriendZone(); // Not instantiable. 1402 FriendZone(); // Not instantiable.
1393 1403
1394 // Adds/removes a callback called on creation of each new WebContents. 1404 // Adds/removes a callback called on creation of each new WebContents.
1395 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1405 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1396 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1406 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1397 1407
1398 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1408 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1399 }; 1409 };
1400 1410
1401 } // namespace content 1411 } // namespace content
1402 1412
1403 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1413 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698