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

Side by Side Diff: components/web_contents_delegate_android/web_contents_delegate_android.h

Issue 1153813003: Add user_gesture param to WebContentsDelegate::ActivateContents Base URL: https://chromium.googlesource.com/chromium/src.git@ug1_WebContentsImpl_Activate
Patch Set: Update callers Created 5 years, 7 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 | « components/guest_view/browser/guest_view_base.cc ('k') | content/browser/plugin_browsertest.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 COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _ 5 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _
6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _ 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H _
7 7
8 #include "base/android/jni_weak_ref.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 content::WebContents* OpenURLFromTab( 54 content::WebContents* OpenURLFromTab(
55 content::WebContents* source, 55 content::WebContents* source,
56 const content::OpenURLParams& params) override; 56 const content::OpenURLParams& params) override;
57 content::ColorChooser* OpenColorChooser( 57 content::ColorChooser* OpenColorChooser(
58 content::WebContents* source, 58 content::WebContents* source,
59 SkColor color, 59 SkColor color,
60 const std::vector<content::ColorSuggestion>& suggestions) override; 60 const std::vector<content::ColorSuggestion>& suggestions) override;
61 void NavigationStateChanged(content::WebContents* source, 61 void NavigationStateChanged(content::WebContents* source,
62 content::InvalidateTypes changed_flags) override; 62 content::InvalidateTypes changed_flags) override;
63 void VisibleSSLStateChanged(const content::WebContents* source) override; 63 void VisibleSSLStateChanged(const content::WebContents* source) override;
64 void ActivateContents(content::WebContents* contents) override; 64 void ActivateContents(content::WebContents* contents,
65 bool user_gesture) override;
65 void DeactivateContents(content::WebContents* contents) override; 66 void DeactivateContents(content::WebContents* contents) override;
66 void LoadingStateChanged(content::WebContents* source, 67 void LoadingStateChanged(content::WebContents* source,
67 bool to_different_document) override; 68 bool to_different_document) override;
68 void LoadProgressChanged(content::WebContents* source, 69 void LoadProgressChanged(content::WebContents* source,
69 double load_progress) override; 70 double load_progress) override;
70 void RendererUnresponsive(content::WebContents* source) override; 71 void RendererUnresponsive(content::WebContents* source) override;
71 void RendererResponsive(content::WebContents* source) override; 72 void RendererResponsive(content::WebContents* source) override;
72 void WebContentsCreated(content::WebContents* source_contents, 73 void WebContentsCreated(content::WebContents* source_contents,
73 int opener_render_frame_id, 74 int opener_render_frame_id,
74 const base::string16& frame_name, 75 const base::string16& frame_name,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 JavaObjectWeakGlobalRef weak_java_delegate_; 122 JavaObjectWeakGlobalRef weak_java_delegate_;
122 123
123 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; 124 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_;
124 }; 125 };
125 126
126 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); 127 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
127 128
128 } // namespace web_contents_delegate_android 129 } // namespace web_contents_delegate_android
129 130
130 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_ 131 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_
OLDNEW
« no previous file with comments | « components/guest_view/browser/guest_view_base.cc ('k') | content/browser/plugin_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698