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

Side by Side Diff: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h

Issue 10868116: Pass result of blockage across content API when new tab blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELE GATE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELE GATE_ANDROID_H_
6 #define CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELE GATE_ANDROID_H_ 6 #define CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELE GATE_ANDROID_H_
7 7
8 #include "base/android/jni_helper.h" 8 #include "base/android/jni_helper.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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const GURL& url, 63 const GURL& url,
64 const content::Referrer& referrer, 64 const content::Referrer& referrer,
65 WindowOpenDisposition disposition, 65 WindowOpenDisposition disposition,
66 content::PageTransition transition_type) OVERRIDE; 66 content::PageTransition transition_type) OVERRIDE;
67 virtual void NavigationStateChanged(const content::WebContents* source, 67 virtual void NavigationStateChanged(const content::WebContents* source,
68 unsigned changed_flags) OVERRIDE; 68 unsigned changed_flags) OVERRIDE;
69 virtual void AddNewContents(content::WebContents* source, 69 virtual void AddNewContents(content::WebContents* source,
70 content::WebContents* new_contents, 70 content::WebContents* new_contents,
71 WindowOpenDisposition disposition, 71 WindowOpenDisposition disposition,
72 const gfx::Rect& initial_pos, 72 const gfx::Rect& initial_pos,
73 bool user_gesture) OVERRIDE; 73 bool user_gesture,
74 bool* was_blocked) OVERRIDE;
74 virtual void ActivateContents(content::WebContents* contents) OVERRIDE; 75 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
75 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE; 76 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
76 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE; 77 virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
77 virtual void LoadProgressChanged(content::WebContents* source, 78 virtual void LoadProgressChanged(content::WebContents* source,
78 double load_progress) OVERRIDE; 79 double load_progress) OVERRIDE;
79 virtual void CloseContents(content::WebContents* source) OVERRIDE; 80 virtual void CloseContents(content::WebContents* source) OVERRIDE;
80 virtual void MoveContents(content::WebContents* source, 81 virtual void MoveContents(content::WebContents* source,
81 const gfx::Rect& pos) OVERRIDE; 82 const gfx::Rect& pos) OVERRIDE;
82 virtual bool AddMessageToConsole(content::WebContents* source, 83 virtual bool AddMessageToConsole(content::WebContents* source,
83 int32 level, 84 int32 level,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 120
120 // The object responsible for creating JavaScript dialogs. 121 // The object responsible for creating JavaScript dialogs.
121 content::JavaScriptDialogCreator* javascript_dialog_creator_; 122 content::JavaScriptDialogCreator* javascript_dialog_creator_;
122 }; 123 };
123 124
124 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); 125 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);
125 126
126 } // namespace web_contents_delegate_android 127 } // namespace web_contents_delegate_android
127 128
128 #endif // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_D ELEGATE_ANDROID_H_ 129 #endif // CHROME_BROWSER_COMPONENT_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_D ELEGATE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698