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

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

Issue 11193014: [Android] Upstream external_protocol_dialog_android.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 const content::ContextMenuParams& params, 53 const content::ContextMenuParams& params,
54 const base::Callback<void(int)>& callback) OVERRIDE; 54 const base::Callback<void(int)>& callback) OVERRIDE;
55 55
56 virtual void AddShortcutToBookmark(const GURL& url, 56 virtual void AddShortcutToBookmark(const GURL& url,
57 const string16& title, 57 const string16& title,
58 const SkBitmap& skbitmap, 58 const SkBitmap& skbitmap,
59 int r_value, 59 int r_value,
60 int g_value, 60 int g_value,
61 int b_value) OVERRIDE; 61 int b_value) OVERRIDE;
62 62
63 // Called when the common ExternalProtocolHandler wants to
64 // run the external protocol dialog.
Ted C 2012/10/16 23:25:10 also, I would leave this comment out of the impl.h
newt (away) 2012/10/16 23:29:50 Done.
65 virtual void RunExternalProtocolDialog(const GURL& url) OVERRIDE;
66
63 // Register the Tab's native methods through JNI. 67 // Register the Tab's native methods through JNI.
64 static bool RegisterTabBaseAndroidImpl(JNIEnv* env); 68 static bool RegisterTabBaseAndroidImpl(JNIEnv* env);
65 69
66 // -------------------------------------------------------------------------- 70 // --------------------------------------------------------------------------
67 // Methods called from Java via JNI 71 // Methods called from Java via JNI
68 // -------------------------------------------------------------------------- 72 // --------------------------------------------------------------------------
69 void InitWebContentsDelegate(JNIEnv* env, 73 void InitWebContentsDelegate(JNIEnv* env,
70 jobject obj, 74 jobject obj,
71 jobject web_contents_delegate); 75 jobject web_contents_delegate);
72 76
73 base::android::ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env, 77 base::android::ScopedJavaLocalRef<jstring> FixupUrl(JNIEnv* env,
74 jobject obj, 78 jobject obj,
75 jstring url); 79 jstring url);
76 80
77 protected: 81 protected:
78 virtual ~TabBaseAndroidImpl(); 82 virtual ~TabBaseAndroidImpl();
79 83
80 private: 84 private:
81 scoped_ptr<content::WebContents> web_contents_; 85 scoped_ptr<content::WebContents> web_contents_;
82 scoped_ptr<WebKit::WebLayer> tab_layer_; 86 scoped_ptr<WebKit::WebLayer> tab_layer_;
83 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid> 87 scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
84 web_contents_delegate_; 88 web_contents_delegate_;
85 89
86 DISALLOW_COPY_AND_ASSIGN(TabBaseAndroidImpl); 90 DISALLOW_COPY_AND_ASSIGN(TabBaseAndroidImpl);
87 }; 91 };
88 92
89 #endif // CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_ 93 #endif // CHROME_BROWSER_ANDROID_TAB_BASE_ANDROID_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698