components/web_contents_delegate_android/web_contents_delegate_android.h - Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment.

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

Issue 302653006: Remove use of ResourceRequestInfo::GetRequestID from cert enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Android build. Created 6 years, 6 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

« chrome/browser/ssl/ssl_blocking_page.cc ('K') | « components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java ('k') | components/web_contents_delegate_android/web_contents_delegate_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 // Overridden from WebContentsDelegate:	53 // Overridden from WebContentsDelegate:

54 virtual content::WebContents* OpenURLFromTab(	54 virtual content::WebContents* OpenURLFromTab(

55 content::WebContents* source,	55 content::WebContents* source,

56 const content::OpenURLParams& params) OVERRIDE;	56 const content::OpenURLParams& params) OVERRIDE;

57 virtual content::ColorChooser* OpenColorChooser(	57 virtual 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 virtual void NavigationStateChanged(const content::WebContents* source,	61 virtual void NavigationStateChanged(const content::WebContents* source,

62 unsigned changed_flags) OVERRIDE;	62 unsigned changed_flags) OVERRIDE;

	63 virtual void VisibleSSLStateChanged(

	64 const content::WebContents* source) OVERRIDE;

63 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;	65 virtual void ActivateContents(content::WebContents* contents) OVERRIDE;

64 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;	66 virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;

65 virtual void LoadingStateChanged(content::WebContents* source,	67 virtual void LoadingStateChanged(content::WebContents* source,

66 bool to_different_document) OVERRIDE;	68 bool to_different_document) OVERRIDE;

67 virtual void LoadProgressChanged(content::WebContents* source,	69 virtual void LoadProgressChanged(content::WebContents* source,

68 double load_progress) OVERRIDE;	70 double load_progress) OVERRIDE;

69 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;	71 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;

70 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;	72 virtual void RendererResponsive(content::WebContents* source) OVERRIDE;

71 virtual void CloseContents(content::WebContents* source) OVERRIDE;	73 virtual void CloseContents(content::WebContents* source) OVERRIDE;

72 virtual void MoveContents(content::WebContents* source,	74 virtual void MoveContents(content::WebContents* source,

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 JavaObjectWeakGlobalRef weak_java_delegate_;	111 JavaObjectWeakGlobalRef weak_java_delegate_;

110	112

111 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_;	113 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_;

112 };	114 };

113	115

114 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);	116 bool RegisterWebContentsDelegateAndroid(JNIEnv* env);

115	117

116 } // namespace web_contents_delegate_android	118 } // namespace web_contents_delegate_android

117	119

118 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_	120 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI D_H_

OLD	NEW