X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/4825688a6b3646e423685001014e92385e894d09..ff1a355f39b4baacc1163b19e3ab7e99109cce4b:/UICaboodle/BrowserView.h

diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index bd956b83..c61fef41 100644
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -1,22 +1,12 @@
-#import "ResetView.h"
+#import <UICaboodle/RVPage.h>
+#import <UICaboodle/RVBook.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>
+#import <UIKit/UIKit.h>
 
+#include <WebKit/DOMNodeList.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>
 
@@ -35,19 +25,19 @@
 @class IndirectDelegate;
 
 @interface WebScriptObject (UICaboodle)
-- (unsigned) count;
+- (NSUInteger) count;
 - (id) objectAtIndex:(unsigned)index;
 @end
 
-@protocol BrowserViewDelegate
-- (RVPage *) pageForURL:(NSURL *)url hasTag:(int *)tag;
+@protocol BrowserControllerDelegate
+- (CYViewController *) pageForURL:(NSURL *)url hasTag:(int *)tag;
 @end
 
-@interface BrowserView : RVPage <
-    RVBookHook
+@interface BrowserController : CYViewController <
+    HookProtocol
 > {
     UIScroller *scroller_;
-    UIWebDocumentView *webview_;
+    UIWebDocumentView *document_;
     UIProgressIndicator *indicator_;
     IndirectDelegate *indirect_;
     NSURLAuthenticationChallenge *challenge_;
@@ -78,12 +68,13 @@
     bool editing_;
 
     Class class_;
+
+    id reloaditem_;
+    id loadingitem_;
 }
 
 + (void) _initialize;
 
-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button;
-
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy;
 - (void) loadURL:(NSURL *)url;
 
@@ -96,9 +87,9 @@
 - (WebView *) webView;
 - (UIWebDocumentView *) documentView;
 
-- (id) initWithBook:(RVBook *)book;
-- (id) initWithBook:(RVBook *)book forWidth:(float)width;
-- (id) initWithBook:(RVBook *)book forWidth:(float)width ofClass:(Class)_class;
+- (id) init;
+- (id) initWithWidth:(float)width;
+- (id) initWithWidth:(float)width ofClass:(Class)_class;
 
 - (NSString *) stringByEvaluatingJavaScriptFromString:(NSString *)script;
 - (void) callFunction:(WebScriptObject *)function;
@@ -116,9 +107,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