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

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

Issue 2634333003: Convert SearchTabHelper to use the new navigation callbacks. (Closed)
Patch Set: closer to original Created 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/search/search_tab_helper.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_UI_SEARCH_SEARCH_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 DetermineIfPageSupportsInstant_Local); 116 DetermineIfPageSupportsInstant_Local);
117 FRIEND_TEST_ALL_PREFIXES(InstantTabTest, 117 FRIEND_TEST_ALL_PREFIXES(InstantTabTest,
118 DetermineIfPageSupportsInstant_NonLocal); 118 DetermineIfPageSupportsInstant_NonLocal);
119 FRIEND_TEST_ALL_PREFIXES(InstantTabTest, 119 FRIEND_TEST_ALL_PREFIXES(InstantTabTest,
120 PageURLDoesntBelongToInstantRenderer); 120 PageURLDoesntBelongToInstantRenderer);
121 FRIEND_TEST_ALL_PREFIXES(InstantTabTest, PageSupportsInstant); 121 FRIEND_TEST_ALL_PREFIXES(InstantTabTest, PageSupportsInstant);
122 122
123 explicit SearchTabHelper(content::WebContents* web_contents); 123 explicit SearchTabHelper(content::WebContents* web_contents);
124 124
125 // Overridden from contents::WebContentsObserver: 125 // Overridden from contents::WebContentsObserver:
126 void DidStartNavigationToPendingEntry( 126 void DidStartNavigation(
127 const GURL& url, 127 content::NavigationHandle* navigation_handle) override;
128 content::ReloadType reload_type) override; 128 void DidFinishNavigation(
129 void DidNavigateMainFrame( 129 content::NavigationHandle* navigation_handle) override;
130 const content::LoadCommittedDetails& details,
131 const content::FrameNavigateParams& params) override;
132 void DidFinishLoad(content::RenderFrameHost* render_frame_host, 130 void DidFinishLoad(content::RenderFrameHost* render_frame_host,
133 const GURL& validated_url) override; 131 const GURL& validated_url) override;
134 void NavigationEntryCommitted( 132 void NavigationEntryCommitted(
135 const content::LoadCommittedDetails& load_details) override; 133 const content::LoadCommittedDetails& load_details) override;
136 134
137 // Overridden from SearchIPCRouter::Delegate: 135 // Overridden from SearchIPCRouter::Delegate:
138 void OnInstantSupportDetermined(bool supports_instant) override; 136 void OnInstantSupportDetermined(bool supports_instant) override;
139 void FocusOmnibox(OmniboxFocusState state) override; 137 void FocusOmnibox(OmniboxFocusState state) override;
140 void OnDeleteMostVisitedItem(const GURL& url) override; 138 void OnDeleteMostVisitedItem(const GURL& url) override;
141 void OnUndoMostVisitedDeletion(const GURL& url) override; 139 void OnUndoMostVisitedDeletion(const GURL& url) override;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 189
192 // Delegate for notifying our owner about the SearchTabHelper state. Not owned 190 // Delegate for notifying our owner about the SearchTabHelper state. Not owned
193 // by us. 191 // by us.
194 // NULL on iOS and Android because they don't use the Instant framework. 192 // NULL on iOS and Android because they don't use the Instant framework.
195 SearchTabHelperDelegate* delegate_; 193 SearchTabHelperDelegate* delegate_;
196 194
197 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper); 195 DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
198 }; 196 };
199 197
200 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_ 198 #endif // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/search/search_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698