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

Side by Side Diff: content/browser/tab_contents/interstitial_page.h

Issue 6894009: Change NavigationEntry's title fields to carry the text direction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/i18n/rtl.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "base/process_util.h" 14 #include "base/process_util.h"
14 #include "content/browser/renderer_host/render_view_host_delegate.h" 15 #include "content/browser/renderer_host/render_view_host_delegate.h"
15 #include "content/common/notification_observer.h" 16 #include "content/common/notification_observer.h"
16 #include "content/common/notification_registrar.h" 17 #include "content/common/notification_registrar.h"
17 #include "content/common/renderer_preferences.h" 18 #include "content/common/renderer_preferences.h"
18 #include "googleurl/src/gurl.h" 19 #include "googleurl/src/gurl.h"
19 #include "ui/gfx/size.h" 20 #include "ui/gfx/size.h"
20 21
21 class NavigationEntry; 22 class NavigationEntry;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // Whether or not we should change the title of the tab when hidden (to revert 221 // Whether or not we should change the title of the tab when hidden (to revert
221 // it to its original value). 222 // it to its original value).
222 bool should_revert_tab_title_; 223 bool should_revert_tab_title_;
223 224
224 // Whether the ResourceDispatcherHost has been notified to cancel/resume the 225 // Whether the ResourceDispatcherHost has been notified to cancel/resume the
225 // resource requests blocked for the RenderViewHost. 226 // resource requests blocked for the RenderViewHost.
226 bool resource_dispatcher_host_notified_; 227 bool resource_dispatcher_host_notified_;
227 228
228 // The original title of the tab that should be reverted to when the 229 // The original title of the tab that should be reverted to when the
229 // interstitial is hidden. 230 // interstitial is hidden.
230 std::wstring original_tab_title_; 231 base::i18n::String16WithDirection original_tab_title_;
231 232
232 // Our RenderViewHostViewDelegate, necessary for accelerators to work. 233 // Our RenderViewHostViewDelegate, necessary for accelerators to work.
233 scoped_ptr<InterstitialPageRVHViewDelegate> rvh_view_delegate_; 234 scoped_ptr<InterstitialPageRVHViewDelegate> rvh_view_delegate_;
234 235
235 // We keep a map of the various blocking pages shown as the UI tests need to 236 // We keep a map of the various blocking pages shown as the UI tests need to
236 // be able to retrieve them. 237 // be able to retrieve them.
237 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap; 238 typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap;
238 static InterstitialPageMap* tab_to_interstitial_page_; 239 static InterstitialPageMap* tab_to_interstitial_page_;
239 240
240 // Settings passed to the renderer. 241 // Settings passed to the renderer.
241 RendererPreferences renderer_preferences_; 242 RendererPreferences renderer_preferences_;
242 243
243 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); 244 DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
244 }; 245 };
245 246
246 #endif // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 247 #endif // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
OLDNEW
« no previous file with comments | « content/browser/site_instance_unittest.cc ('k') | content/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698