Merge branch 'master' of git.saurik.com:cydia

[cydia.git] / UICaboodle / BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index f02e6793afe8cc9e19dfc3677937b45d0802d9e9..23be6317a91438c7400f275efe1977abd26bb02b 100644 (file)
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -1,23 +1,9 @@
 #import "ResetView.h"
 
-
-#include <WebKit/DOMCSSPrimitiveValue.h>
-#include <WebKit/DOMCSSStyleDeclaration.h>
-#include <WebKit/DOMDocument.h>
-#include <WebKit/DOMHTMLBodyElement.h>
 #include <WebKit/DOMNodeList.h>
-#include <WebKit/DOMRGBColor.h>
-
 #include <WebKit/WebFrame.h>
-#include <WebKit/WebPolicyDelegate.h>
-#include <WebKit/WebPreferences.h>
 #include <WebKit/WebScriptObject.h>
-
-#import <WebKit/WebView.h>
-#import <WebKit/WebView-WebPrivate.h>
-
-#include <WebCore/Page.h>
-#include <WebCore/Settings.h>
+#include <WebKit/WebView.h>
 
 #import <JavaScriptCore/JavaScriptCore.h>
 
@@ -34,16 +20,23 @@
 
 @class Database;
 @class IndirectDelegate;
-@class CydiaObject;
 
-@interface BrowserView : RVPage <
-    RVBookHook
+@interface WebScriptObject (UICaboodle)
+- (unsigned) count;
+- (id) objectAtIndex:(unsigned)index;
+@end
+
+@protocol BrowserControllerDelegate
+- (UCViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+@end
+
+@interface BrowserController : UCViewController <
+    HookProtocol
 > {
     UIScroller *scroller_;
-    UIWebDocumentView *webview_;
+    UIWebDocumentView *document_;
     UIProgressIndicator *indicator_;
     IndirectDelegate *indirect_;
-    CydiaObject *cydia_;
     NSURLAuthenticationChallenge *challenge_;
 
     bool error_;
@@ -70,9 +63,14 @@
 
     CGSize size_;
     bool editing_;
+
+    Class class_;
+
+    id reloaditem_;
+    id loadingitem_;
 }
 
-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
++ (void) _initialize;
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
@@ -86,8 +84,9 @@
 - (WebView *) webView;
 - (UIWebDocumentView *) documentView;
 
-- (id) initWithBook:(RVBook *)book;
-- (id) initWithBook:(RVBook *)book forWidth:(float)width;
+- (id) init;
+- (id) initWithWidth:(float)width;
+- (id) initWithWidth:(float)width ofClass:(Class)_class;
 
 - (NSString *) stringByEvaluatingJavaScriptFromString:(NSString *)script;
 - (void) callFunction:(WebScriptObject *)function;
@@ -95,6 +94,8 @@
 - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame;
 
+- (NSURLRequest *) webView:(WebView *)sender resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)source;
+
 + (float) defaultWidth;
 - (void) setViewportWidth:(float)width;
 
@@ -103,9 +104,14 @@
 - (void) setFinishHook:(id)function;
 - (void) setPopupHook:(id)function;
 
-- (id) _rightButtonTitle;
-
 - (bool) promptForSensitive:(NSString *)name;
 - (bool) allowSensitiveRequests;
 
+- (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button;
+- (void) customButtonClicked;
+- (void) applyRightButton;
+
+- (void) _startLoading;
+- (void) close;
+
 @end