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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.h

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 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 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_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 SiteInstance* instance) override; 155 SiteInstance* instance) override;
156 156
157 FrameTree* GetFrameTree() override; 157 FrameTree* GetFrameTree() override;
158 158
159 // RenderWidgetHostDelegate implementation: 159 // RenderWidgetHostDelegate implementation:
160 void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override; 160 void RenderWidgetDeleted(RenderWidgetHostImpl* render_widget_host) override;
161 bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, 161 bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
162 bool* is_keyboard_shortcut) override; 162 bool* is_keyboard_shortcut) override;
163 void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override; 163 void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
164 TextInputManager* GetTextInputManager() override; 164 TextInputManager* GetTextInputManager() override;
165 void GetScreenInfo(blink::WebScreenInfo* screen_info) override; 165 void GetScreenInfo(content::ScreenInfo* screen_info) override;
166 void UpdateDeviceScaleFactor(double device_scale_factor) override; 166 void UpdateDeviceScaleFactor(double device_scale_factor) override;
167 167
168 bool enabled() const { return enabled_; } 168 bool enabled() const { return enabled_; }
169 WebContents* web_contents() const; 169 WebContents* web_contents() const;
170 const GURL& url() const { return url_; } 170 const GURL& url() const { return url_; }
171 171
172 // Creates the WebContentsView that shows the interstitial RVH. 172 // Creates the WebContentsView that shows the interstitial RVH.
173 // Overriden in unit tests. 173 // Overriden in unit tests.
174 virtual WebContentsView* CreateWebContentsView(); 174 virtual WebContentsView* CreateWebContentsView();
175 175
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 304 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
305 305
306 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 306 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
307 307
308 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 308 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
309 }; 309 };
310 310
311 } // namespace content 311 } // namespace content
312 312
313 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 313 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698