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

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

Issue 21039: Revert my change to get the tree green. Not sure why the tests became flaky.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
« no previous file with comments | « chrome/browser/ssl/ssl_uitest.cc ('k') | chrome/browser/tab_contents/ipc_status_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gfx/size.h"
11 #include "chrome/browser/renderer_host/render_view_host_delegate.h" 10 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
12 #include "chrome/common/notification_registrar.h" 11 #include "chrome/common/notification_registrar.h"
13 #include "googleurl/src/gurl.h" 12 #include "googleurl/src/gurl.h"
14 13
15 class NavigationEntry; 14 class NavigationEntry;
16 class WebContents; 15 class WebContents;
17 16
18 // This class is a base class for interstitial pages, pages that show some 17 // This class is a base class for interstitial pages, pages that show some
19 // informative message asking for user validation before reaching the target 18 // informative message asking for user validation before reaching the target
20 // page. (Navigating to a page served over bad HTTPS or a page containing 19 // page. (Navigating to a page served over bad HTTPS or a page containing
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // We keep a map of the various blocking pages shown as the UI tests need to 171 // We keep a map of the various blocking pages shown as the UI tests need to
173 // be able to retrieve them. 172 // be able to retrieve them.
174 typedef std::map<WebContents*,InterstitialPage*> InterstitialPageMap; 173 typedef std::map<WebContents*,InterstitialPage*> InterstitialPageMap;
175 static InterstitialPageMap* tab_to_interstitial_page_; 174 static InterstitialPageMap* tab_to_interstitial_page_;
176 175
177 DISALLOW_COPY_AND_ASSIGN(InterstitialPage); 176 DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
178 }; 177 };
179 178
180 #endif // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ 179 #endif // #ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
181 180
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_uitest.cc ('k') | chrome/browser/tab_contents/ipc_status_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698