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

Side by Side Diff: chrome/browser/instant/instant_loader.h

Issue 11644009: Added support for passing WindowOpenDisposition into BrowserInstantController::OpenURL() from the o… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; 116 const std::vector<InstantSuggestion>& suggestions) OVERRIDE;
117 virtual void InstantSupportDetermined(bool supports_instant) OVERRIDE; 117 virtual void InstantSupportDetermined(bool supports_instant) OVERRIDE;
118 virtual void ShowInstantPreview(InstantShownReason reason, 118 virtual void ShowInstantPreview(InstantShownReason reason,
119 int height, 119 int height,
120 InstantSizeUnits units) OVERRIDE; 120 InstantSizeUnits units) OVERRIDE;
121 virtual void StartCapturingKeyStrokes() OVERRIDE; 121 virtual void StartCapturingKeyStrokes() OVERRIDE;
122 virtual void StopCapturingKeyStrokes() OVERRIDE; 122 virtual void StopCapturingKeyStrokes() OVERRIDE;
123 virtual void RenderViewGone() OVERRIDE; 123 virtual void RenderViewGone() OVERRIDE;
124 virtual void AboutToNavigateMainFrame(const GURL& url) OVERRIDE; 124 virtual void AboutToNavigateMainFrame(const GURL& url) OVERRIDE;
125 virtual void NavigateToURL(const GURL& url, 125 virtual void NavigateToURL(const GURL& url,
126 content::PageTransition transition) OVERRIDE; 126 content::PageTransition transition,
127 WindowOpenDisposition disposition) OVERRIDE;
127 128
128 // Overridden from content::NotificationObserver: 129 // Overridden from content::NotificationObserver:
129 virtual void Observe(int type, 130 virtual void Observe(int type,
130 const content::NotificationSource& source, 131 const content::NotificationSource& source,
131 const content::NotificationDetails& details) OVERRIDE; 132 const content::NotificationDetails& details) OVERRIDE;
132 133
133 void SetupPreviewContents(); 134 void SetupPreviewContents();
134 void CleanupPreviewContents(); 135 void CleanupPreviewContents();
135 void ReplacePreviewContents(content::WebContents* old_contents, 136 void ReplacePreviewContents(content::WebContents* old_contents,
136 content::WebContents* new_contents); 137 content::WebContents* new_contents);
(...skipping 11 matching lines...) Expand all
148 bool is_pointer_down_from_activate_; 149 bool is_pointer_down_from_activate_;
149 history::HistoryAddPageArgs last_navigation_; 150 history::HistoryAddPageArgs last_navigation_;
150 151
151 // Used to get notifications about renderers coming and going. 152 // Used to get notifications about renderers coming and going.
152 content::NotificationRegistrar registrar_; 153 content::NotificationRegistrar registrar_;
153 154
154 DISALLOW_COPY_AND_ASSIGN(InstantLoader); 155 DISALLOW_COPY_AND_ASSIGN(InstantLoader);
155 }; 156 };
156 157
157 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 158 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698