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

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

Issue 11098008: Adding a WindowAndroidHelper class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yaron's nit Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/android/tab_base_android_impl.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_BASE_ANDROID_IMPL_H_ 5 #ifndef CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_
6 #define CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_ 6 #define CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "chrome/browser/android/tab_android.h" 12 #include "chrome/browser/android/tab_android.h"
13 13
14 namespace browser_sync { 14 namespace browser_sync {
15 class SyncedTabDelegate; 15 class SyncedTabDelegate;
16 } 16 }
17 17
18 namespace chrome { 18 namespace chrome {
19 namespace android { 19 namespace android {
20 class ChromeWebContentsDelegateAndroid; 20 class ChromeWebContentsDelegateAndroid;
21 } 21 }
22 } 22 }
23 23
24 namespace content { 24 namespace content {
25 class WebContents; 25 class WebContents;
26 } 26 }
27 27
28 namespace ui {
29 class WindowAndroid;
30 }
31
28 namespace WebKit { 32 namespace WebKit {
29 class WebLayer; 33 class WebLayer;
30 } 34 }
31 35
32 class TabBaseAndroidImpl : public TabAndroid { 36 class TabBaseAndroidImpl : public TabAndroid {
33 public: 37 public:
34 TabBaseAndroidImpl(JNIEnv* env, 38 TabBaseAndroidImpl(JNIEnv* env,
35 jobject obj, 39 jobject obj,
36 content::WebContents* web_contents); 40 content::WebContents* web_contents,
41 ui::WindowAndroid* window_android);
37 void Destroy(JNIEnv* env, jobject obj); 42 void Destroy(JNIEnv* env, jobject obj);
38 43
39 WebKit::WebLayer* tab_layer() const { return tab_layer_.get(); } 44 WebKit::WebLayer* tab_layer() const { return tab_layer_.get(); }
40 45
41 // -------------------------------------------------------------------------- 46 // --------------------------------------------------------------------------
42 // TabAndroid Methods 47 // TabAndroid Methods
43 // -------------------------------------------------------------------------- 48 // --------------------------------------------------------------------------
44 virtual browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() OVERRIDE; 49 virtual browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() OVERRIDE;
45 50
46 virtual void OnReceivedHttpAuthRequest(jobject auth_handler, 51 virtual void OnReceivedHttpAuthRequest(jobject auth_handler,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 private: 85 private:
81 scoped_ptr<content::WebContents> web_contents_; 86 scoped_ptr<content::WebContents> web_contents_;
82 scoped_ptr<WebKit::WebLayer> tab_layer_; 87 scoped_ptr<WebKit::WebLayer> tab_layer_;
83 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 88 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
84 web_contents_delegate_; 89 web_contents_delegate_;
85 90
86 DISALLOW_COPY_AND_ASSIGN(TabBaseAndroidImpl); 91 DISALLOW_COPY_AND_ASSIGN(TabBaseAndroidImpl);
87 }; 92 };
88 93
89 #endif // CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_ 94 #endif // CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/android/tab_base_android_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698