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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE; 105 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
106 virtual const GURL& GetURL() const OVERRIDE; 106 virtual const GURL& GetURL() const OVERRIDE;
107 virtual void RenderViewTerminated(RenderViewHost* render_view_host, 107 virtual void RenderViewTerminated(RenderViewHost* render_view_host,
108 base::TerminationStatus status, 108 base::TerminationStatus status,
109 int error_code) OVERRIDE; 109 int error_code) OVERRIDE;
110 virtual void DidNavigate( 110 virtual void DidNavigate(
111 RenderViewHost* render_view_host, 111 RenderViewHost* render_view_host,
112 const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE; 112 const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
113 virtual void UpdateTitle(RenderViewHost* render_view_host, 113 virtual void UpdateTitle(RenderViewHost* render_view_host,
114 int32 page_id, 114 int32 page_id,
115 const string16& title, 115 const base::string16& title,
116 base::i18n::TextDirection title_direction) OVERRIDE; 116 base::i18n::TextDirection title_direction) OVERRIDE;
117 virtual RendererPreferences GetRendererPrefs( 117 virtual RendererPreferences GetRendererPrefs(
118 BrowserContext* browser_context) const OVERRIDE; 118 BrowserContext* browser_context) const OVERRIDE;
119 virtual WebPreferences GetWebkitPrefs() OVERRIDE; 119 virtual WebPreferences GetWebkitPrefs() OVERRIDE;
120 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 120 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
121 virtual void CreateNewWindow( 121 virtual void CreateNewWindow(
122 int route_id, 122 int route_id,
123 int main_frame_route_id, 123 int main_frame_route_id,
124 const ViewHostMsg_CreateWindow_Params& params, 124 const ViewHostMsg_CreateWindow_Params& params,
125 SessionStorageNamespace* session_storage_namespace) OVERRIDE; 125 SessionStorageNamespace* session_storage_namespace) OVERRIDE;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Whether or not the contents was loading resources when the interstitial was 239 // Whether or not the contents was loading resources when the interstitial was
240 // shown. We restore this state if the user proceeds from the interstitial. 240 // shown. We restore this state if the user proceeds from the interstitial.
241 bool web_contents_was_loading_; 241 bool web_contents_was_loading_;
242 242
243 // Whether the ResourceDispatcherHost has been notified to cancel/resume the 243 // Whether the ResourceDispatcherHost has been notified to cancel/resume the
244 // resource requests blocked for the RenderViewHost. 244 // resource requests blocked for the RenderViewHost.
245 bool resource_dispatcher_host_notified_; 245 bool resource_dispatcher_host_notified_;
246 246
247 // The original title of the contents that should be reverted to when the 247 // The original title of the contents that should be reverted to when the
248 // interstitial is hidden. 248 // interstitial is hidden.
249 string16 original_web_contents_title_; 249 base::string16 original_web_contents_title_;
250 250
251 // Our RenderViewHostViewDelegate, necessary for accelerators to work. 251 // Our RenderViewHostViewDelegate, necessary for accelerators to work.
252 scoped_ptr<InterstitialPageRVHDelegateView> rvh_delegate_view_; 252 scoped_ptr<InterstitialPageRVHDelegateView> rvh_delegate_view_;
253 253
254 // Settings passed to the renderer. 254 // Settings passed to the renderer.
255 mutable RendererPreferences renderer_preferences_; 255 mutable RendererPreferences renderer_preferences_;
256 256
257 bool create_view_; 257 bool create_view_;
258 258
259 scoped_ptr<InterstitialPageDelegate> delegate_; 259 scoped_ptr<InterstitialPageDelegate> delegate_;
260 260
261 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 261 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
262 262
263 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 263 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
264 264
265 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 265 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
266 }; 266 };
267 267
268 } // namespace content 268 } // namespace content
269 269
270 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 270 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/download/save_package_unittest.cc ('k') | content/browser/frame_host/interstitial_page_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698