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

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

Issue 368983004: Implemented HandlePopupNavigation from tab_android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle dispostion type CURRENT_TAB Created 6 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
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void SetSyncId(int sync_id); 93 void SetSyncId(int sync_id);
94 94
95 virtual void HandlePopupNavigation(chrome::NavigateParams* params); 95 virtual void HandlePopupNavigation(chrome::NavigateParams* params);
96 96
97 // Called to determine if chrome://welcome should contain links to the terms 97 // Called to determine if chrome://welcome should contain links to the terms
98 // of service and the privacy notice. 98 // of service and the privacy notice.
99 virtual bool ShouldWelcomePageLinkToTermsOfService(); 99 virtual bool ShouldWelcomePageLinkToTermsOfService();
100 100
101 bool HasPrerenderedUrl(GURL gurl); 101 bool HasPrerenderedUrl(GURL gurl);
102 102
103 void MakeLoadURLParams(
104 chrome::NavigateParams* params,
105 content::NavigationController::LoadURLParams* load_url_params);
106
103 // CoreTabHelperDelegate ---------------------------------------------------- 107 // CoreTabHelperDelegate ----------------------------------------------------
104 108
105 virtual void SwapTabContents(content::WebContents* old_contents, 109 virtual void SwapTabContents(content::WebContents* old_contents,
106 content::WebContents* new_contents, 110 content::WebContents* new_contents,
107 bool did_start_load, 111 bool did_start_load,
108 bool did_finish_load) OVERRIDE; 112 bool did_finish_load) OVERRIDE;
109 113
110 // NotificationObserver ----------------------------------------------------- 114 // NotificationObserver -----------------------------------------------------
111 virtual void Observe(int type, 115 virtual void Observe(int type,
112 const content::NotificationSource& source, 116 const content::NotificationSource& source,
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 scoped_ptr<content::WebContents> web_contents_; 167 scoped_ptr<content::WebContents> web_contents_;
164 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 168 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
165 web_contents_delegate_; 169 web_contents_delegate_;
166 170
167 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_; 171 scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
168 172
169 DISALLOW_COPY_AND_ASSIGN(TabAndroid); 173 DISALLOW_COPY_AND_ASSIGN(TabAndroid);
170 }; 174 };
171 175
172 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_ 176 #endif // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_web_contents_delegate_android.cc ('k') | chrome/browser/android/tab_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698