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

Side by Side Diff: chrome/browser/ui/search/instant_page.h

Issue 18095002: Merge 208596 "Pipe a bit down to the InstantExtended new tab pag..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/
Patch Set: Created 7 years, 5 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 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 CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Once true, it never becomes false (the page isn't expected to drop API 125 // Once true, it never becomes false (the page isn't expected to drop API
126 // support suddenly). 126 // support suddenly).
127 virtual bool supports_instant() const; 127 virtual bool supports_instant() const;
128 128
129 // Returns true if the page is the local NTP (i.e. its URL is 129 // Returns true if the page is the local NTP (i.e. its URL is
130 // chrome::kChromeSearchLocalNTPURL). 130 // chrome::kChromeSearchLocalNTPURL).
131 virtual bool IsLocal() const; 131 virtual bool IsLocal() const;
132 132
133 void InitializeFonts(); 133 void InitializeFonts();
134 134
135 void InitializePromos();
136
135 protected: 137 protected:
136 InstantPage(Delegate* delegate, const std::string& instant_url, 138 InstantPage(Delegate* delegate, const std::string& instant_url,
137 bool is_incognito); 139 bool is_incognito);
138 140
139 // Sets |web_contents| as the page to communicate with. |web_contents| may be 141 // Sets |web_contents| as the page to communicate with. |web_contents| may be
140 // NULL, which effectively stops all communication. 142 // NULL, which effectively stops all communication.
141 void SetContents(content::WebContents* web_contents); 143 void SetContents(content::WebContents* web_contents);
142 144
143 Delegate* delegate() const { return delegate_; } 145 Delegate* delegate() const { return delegate_; }
144 146
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 221
220 Delegate* const delegate_; 222 Delegate* const delegate_;
221 scoped_ptr<InstantIPCSender> ipc_sender_; 223 scoped_ptr<InstantIPCSender> ipc_sender_;
222 const std::string instant_url_; 224 const std::string instant_url_;
223 const bool is_incognito_; 225 const bool is_incognito_;
224 226
225 DISALLOW_COPY_AND_ASSIGN(InstantPage); 227 DISALLOW_COPY_AND_ASSIGN(InstantPage);
226 }; 228 };
227 229
228 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_ 230 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_ipc_sender.cc ('k') | chrome/browser/ui/search/instant_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698