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

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

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 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
« no previous file with comments | « chrome/browser/ui/search/instant_loader.cc ('k') | chrome/browser/ui/search/instant_ntp.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 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_INSTANT_INSTANT_NTP_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_NTP_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/instant/instant_loader.h" 13 #include "chrome/browser/ui/search/instant_loader.h"
14 #include "chrome/browser/instant/instant_page.h" 14 #include "chrome/browser/ui/search/instant_page.h"
15 15
16 class Profile; 16 class Profile;
17 17
18 // InstantNTP is used to preload an Instant page that will be swapped in when a 18 // InstantNTP is used to preload an Instant page that will be swapped in when a
19 // user navigates to a New Tab Page (NTP). The InstantNTP contents are never 19 // user navigates to a New Tab Page (NTP). The InstantNTP contents are never
20 // shown in an un-committed state. 20 // shown in an un-committed state.
21 class InstantNTP : public InstantPage, 21 class InstantNTP : public InstantPage,
22 public InstantLoader::Delegate { 22 public InstantLoader::Delegate {
23 public: 23 public:
24 InstantNTP(InstantPage::Delegate* delegate, const std::string& instant_url); 24 InstantNTP(InstantPage::Delegate* delegate, const std::string& instant_url);
(...skipping 28 matching lines...) Expand all
53 // Overridden from InstantPage: 53 // Overridden from InstantPage:
54 virtual bool ShouldProcessRenderViewCreated() OVERRIDE; 54 virtual bool ShouldProcessRenderViewCreated() OVERRIDE;
55 virtual bool ShouldProcessRenderViewGone() OVERRIDE; 55 virtual bool ShouldProcessRenderViewGone() OVERRIDE;
56 56
57 InstantLoader loader_; 57 InstantLoader loader_;
58 const std::string instant_url_; 58 const std::string instant_url_;
59 59
60 DISALLOW_COPY_AND_ASSIGN(InstantNTP); 60 DISALLOW_COPY_AND_ASSIGN(InstantNTP);
61 }; 61 };
62 62
63 #endif // CHROME_BROWSER_INSTANT_INSTANT_NTP_H_ 63 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_NTP_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_loader.cc ('k') | chrome/browser/ui/search/instant_ntp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698