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

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

Issue 11555033: Adding local html page used in Instant Extended mode when instant is disabled or unavailable. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix uninitialized variable. Created 8 years 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/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.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 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // Returns info about the last navigation by the Instant page. If the page 79 // Returns info about the last navigation by the Instant page. If the page
80 // hasn't navigated since the last Update(), the URL is empty. 80 // hasn't navigated since the last Update(), the URL is empty.
81 const history::HistoryAddPageArgs& last_navigation() const { 81 const history::HistoryAddPageArgs& last_navigation() const {
82 return last_navigation_; 82 return last_navigation_;
83 } 83 }
84 84
85 // Called by the history tab helper with information that it would have added 85 // Called by the history tab helper with information that it would have added
86 // to the history service had this WebContents not been used for Instant. 86 // to the history service had this WebContents not been used for Instant.
87 void DidNavigate(const history::HistoryAddPageArgs& add_page_args); 87 void DidNavigate(const history::HistoryAddPageArgs& add_page_args);
88 88
89 // Returns true if the loader is using
90 // InstantController::kLocalOmniboxPopupURL as the |instant_url_|.
91 bool IsUsingLocalPreview() const;
92
89 // Calls through to methods of the same name on InstantClient. 93 // Calls through to methods of the same name on InstantClient.
90 void Update(const string16& text, 94 void Update(const string16& text,
91 size_t selection_start, 95 size_t selection_start,
92 size_t selection_end, 96 size_t selection_end,
93 bool verbatim); 97 bool verbatim);
94 void Submit(const string16& text); 98 void Submit(const string16& text);
95 void Cancel(const string16& text); 99 void Cancel(const string16& text);
96 void SetPopupBounds(const gfx::Rect& bounds); 100 void SetPopupBounds(const gfx::Rect& bounds);
97 void SetMarginSize(int start, int end); 101 void SetMarginSize(int start, int end);
98 void SendAutocompleteResults( 102 void SendAutocompleteResults(
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 bool is_pointer_down_from_activate_; 148 bool is_pointer_down_from_activate_;
145 history::HistoryAddPageArgs last_navigation_; 149 history::HistoryAddPageArgs last_navigation_;
146 150
147 // Used to get notifications about renderers coming and going. 151 // Used to get notifications about renderers coming and going.
148 content::NotificationRegistrar registrar_; 152 content::NotificationRegistrar registrar_;
149 153
150 DISALLOW_COPY_AND_ASSIGN(InstantLoader); 154 DISALLOW_COPY_AND_ASSIGN(InstantLoader);
151 }; 155 };
152 156
153 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 157 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698