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

Side by Side Diff: chrome/browser/ui/android/tab_model/tab_model_base.h

Issue 583373002: Break apart the TabModelBase's JNI calls into its own class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_ 5 #ifndef CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_
6 #define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_ 6 #define CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 class WebContents; 21 class WebContents;
22 } 22 }
23 23
24 // Native representation of TabModelBase which provides access to information 24 // Native representation of TabModelBase which provides access to information
25 // about a tabstrip to native code and could potentially be used in place of 25 // about a tabstrip to native code and could potentially be used in place of
26 // Browser for some functionality in Clank. 26 // Browser for some functionality in Clank.
27 class TabModelBase : public TabModel { 27 class TabModelBase : public TabModel {
28 public: 28 public:
29 TabModelBase(JNIEnv* env, jobject obj, Profile* profile); 29 TabModelBase(JNIEnv* env, jobject obj, Profile* profile);
30 void Destroy(JNIEnv* env, jobject obj); 30 void Destroy(JNIEnv* env, jobject obj);
31 virtual ~TabModelBase();
31 32
32 // Called by JNI 33 // Called by JNI
33 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env, 34 base::android::ScopedJavaLocalRef<jobject> GetProfileAndroid(JNIEnv* env,
34 jobject obj); 35 jobject obj);
35 void TabAddedToModel(JNIEnv* env, jobject obj, jobject jtab); 36 void TabAddedToModel(JNIEnv* env, jobject obj, jobject jtab);
36 37
37 // TabModel: 38 // TabModel:
38 virtual int GetTabCount() const OVERRIDE; 39 virtual int GetTabCount() const OVERRIDE;
39 virtual int GetActiveIndex() const OVERRIDE; 40 virtual int GetActiveIndex() const OVERRIDE;
40 virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE; 41 virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
41 virtual TabAndroid* GetTabAt(int index) const OVERRIDE; 42 virtual TabAndroid* GetTabAt(int index) const OVERRIDE;
42 43
43 virtual void SetActiveIndex(int index) OVERRIDE; 44 virtual void SetActiveIndex(int index) OVERRIDE;
44 virtual void CloseTabAt(int index) OVERRIDE; 45 virtual void CloseTabAt(int index) OVERRIDE;
45 46
46 virtual void CreateTab(content::WebContents* web_contents, 47 virtual void CreateTab(content::WebContents* web_contents,
47 int parent_tab_id) OVERRIDE; 48 int parent_tab_id) OVERRIDE;
48 virtual content::WebContents* CreateNewTabForDevTools( 49 virtual content::WebContents* CreateNewTabForDevTools(
49 const GURL& url) OVERRIDE; 50 const GURL& url) OVERRIDE;
50 51
51 // Return true if we are currently restoring sessions asynchronously. 52 // Return true if we are currently restoring sessions asynchronously.
52 virtual bool IsSessionRestoreInProgress() const OVERRIDE; 53 virtual bool IsSessionRestoreInProgress() const OVERRIDE;
53 54
54 // Instructs the TabModel to broadcast a notification that all tabs are now 55 // Instructs the TabModel to broadcast a notification that all tabs are now
55 // loaded from storage. 56 // loaded from storage.
56 void BroadcastSessionRestoreComplete(JNIEnv* env, jobject obj); 57 void BroadcastSessionRestoreComplete(JNIEnv* env, jobject obj);
57 58
58 private: 59 protected:
59 virtual ~TabModelBase();
60
61 JavaObjectWeakGlobalRef java_object_; 60 JavaObjectWeakGlobalRef java_object_;
62 }; 61 };
63 62
64 // Register the Tab's native methods through jni. 63 // Register the Tab's native methods through jni.
65 bool RegisterTabModelBase(JNIEnv* env); 64 bool RegisterTabModelBase(JNIEnv* env);
66 65
67 #endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_ 66 #endif // CHROME_BROWSER_UI_ANDROID_TAB_MODEL_TAB_MODEL_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698