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

Side by Side Diff: chrome/browser/android/tab_android.h

Issue 930853005: [Instant] Default Search Provider change redirects to local NTP in some cases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: includes Created 5 years, 10 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/android/tab_android.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_ANDROID_TAB_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 content::NavigationController::LoadURLParams* load_url_params); 118 content::NavigationController::LoadURLParams* load_url_params);
119 119
120 // CoreTabHelperDelegate ---------------------------------------------------- 120 // CoreTabHelperDelegate ----------------------------------------------------
121 121
122 void SwapTabContents(content::WebContents* old_contents, 122 void SwapTabContents(content::WebContents* old_contents,
123 content::WebContents* new_contents, 123 content::WebContents* new_contents,
124 bool did_start_load, 124 bool did_start_load,
125 bool did_finish_load) override; 125 bool did_finish_load) override;
126 126
127 // Overridden from InstantServiceObserver: 127 // Overridden from InstantServiceObserver:
128 void DefaultSearchProviderChanged() override; 128 void DefaultSearchProviderChanged(
129 bool google_base_url_domain_changed) override;
129 130
130 // Overridden from SearchTabHelperDelegate: 131 // Overridden from SearchTabHelperDelegate:
131 void OnWebContentsInstantSupportDisabled( 132 void OnWebContentsInstantSupportDisabled(
132 const content::WebContents* web_contents) override; 133 const content::WebContents* web_contents) override;
133 134
134 // NotificationObserver ----------------------------------------------------- 135 // NotificationObserver -----------------------------------------------------
135 void Observe(int type, 136 void Observe(int type,
136 const content::NotificationSource& source, 137 const content::NotificationSource& source,
137 const content::NotificationDetails& details) override; 138 const content::NotificationDetails& details) override;
138 139
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 scoped_ptr<content::WebContents> web_contents_; 231 scoped_ptr<content::WebContents> web_contents_;
231 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 232 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
232 web_contents_delegate_; 233 web_contents_delegate_;
233 234
234 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 235 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
235 236
236 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 237 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
237 }; 238 };
238 239
239 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 240 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698