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

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

Issue 1324293003: Revert of Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 5 #ifndef CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 6 #define CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 28 matching lines...) Expand all
39 ~ChromeWebContentsDelegateAndroid() override; 39 ~ChromeWebContentsDelegateAndroid() override;
40 40
41 void LoadingStateChanged(content::WebContents* source, 41 void LoadingStateChanged(content::WebContents* source,
42 bool to_different_document) override; 42 bool to_different_document) override;
43 void RunFileChooser(content::WebContents* web_contents, 43 void RunFileChooser(content::WebContents* web_contents,
44 const content::FileChooserParams& params) override; 44 const content::FileChooserParams& params) override;
45 scoped_ptr<content::BluetoothChooser> RunBluetoothChooser( 45 scoped_ptr<content::BluetoothChooser> RunBluetoothChooser(
46 content::WebContents* web_contents, 46 content::WebContents* web_contents,
47 const content::BluetoothChooser::EventHandler& event_handler, 47 const content::BluetoothChooser::EventHandler& event_handler,
48 const GURL& origin) override; 48 const GURL& origin) override;
49
50 void VisibleSSLStateChanged(content::WebContents* source) override;
51 void CloseContents(content::WebContents* web_contents) override; 49 void CloseContents(content::WebContents* web_contents) override;
52 blink::WebDisplayMode GetDisplayMode( 50 blink::WebDisplayMode GetDisplayMode(
53 const content::WebContents* web_contents) const override; 51 const content::WebContents* web_contents) const override;
54 void FindReply(content::WebContents* web_contents, 52 void FindReply(content::WebContents* web_contents,
55 int request_id, 53 int request_id,
56 int number_of_matches, 54 int number_of_matches,
57 const gfx::Rect& selection_rect, 55 const gfx::Rect& selection_rect,
58 int active_match_ordinal, 56 int active_match_ordinal,
59 bool final_update) override; 57 bool final_update) override;
60 void FindMatchRectsReply(content::WebContents* web_contents, 58 void FindMatchRectsReply(content::WebContents* web_contents,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 content::NotificationRegistrar notification_registrar_; 96 content::NotificationRegistrar notification_registrar_;
99 }; 97 };
100 98
101 // Register the native methods through JNI. 99 // Register the native methods through JNI.
102 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env); 100 bool RegisterChromeWebContentsDelegateAndroid(JNIEnv* env);
103 101
104 } // namespace android 102 } // namespace android
105 } // namespace chrome 103 } // namespace chrome
106 104
107 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_ 105 #endif // CHROME_BROWSER_ANDROID_CHROME_WEB_CONTENTS_DELEGATE_ANDROID_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/android/chrome_web_contents_delegate_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698