Modified: trunk/Tools/WinLauncher/WinLauncher.h (170480 => 170481)
--- trunk/Tools/WinLauncher/WinLauncher.h 2014-06-26 15:30:23 UTC (rev 170480)
+++ trunk/Tools/WinLauncher/WinLauncher.h 2014-06-26 16:52:21 UTC (rev 170481)
@@ -1,31 +1,31 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <WebKit/WebKit.h>
-#include <vector>
-
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <WebKit/WebKit.h>
+#include <vector>
+
typedef _com_ptr_t<_com_IIID<IWebFrame, &__uuidof(IWebFrame)>> IWebFramePtr;
typedef _com_ptr_t<_com_IIID<IWebView, &__uuidof(IWebView)>> IWebViewPtr;
typedef _com_ptr_t<_com_IIID<IWebViewPrivate, &__uuidof(IWebViewPrivate)>> IWebViewPrivatePtr;
@@ -37,54 +37,54 @@
typedef _com_ptr_t<_com_IIID<IWebUIDelegate, &__uuidof(IWebUIDelegate)>> IWebUIDelegatePtr;
typedef _com_ptr_t<_com_IIID<IAccessibilityDelegate, &__uuidof(IAccessibilityDelegate)>> IAccessibilityDelegatePtr;
typedef _com_ptr_t<_com_IIID<IWebInspector, &__uuidof(IWebInspector)>> IWebInspectorPtr;
-
-class WinLauncher
-{
-public:
- WinLauncher(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
-
- HRESULT init();
- HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL, HWND& viewWnd);
-
+
+class WinLauncher
+{
+public:
+ WinLauncher(HWND mainWnd, HWND urlBarWnd, bool useLayeredWebView = false);
+
+ HRESULT init();
+ HRESULT prepareViews(HWND mainWnd, const RECT& clientRect, const BSTR& requestedURL, HWND& viewWnd);
+
HRESULT loadURL(const BSTR& passedURL);
-
- void showLastVisitedSites(IWebView& webView);
- void launchInspector();
- void navigateForwardOrBackward(HWND hWnd, UINT menuID);
+
+ void showLastVisitedSites(IWebView& webView);
+ void launchInspector();
+ void navigateForwardOrBackward(HWND hWnd, UINT menuID);
void navigateToHistory(HWND hWnd, UINT menuID);
- bool seedInitialDefaultPreferences();
- bool setToDefaultPreferences();
-
- HRESULT setFrameLoadDelegate(IWebFrameLoadDelegate*);
+ bool seedInitialDefaultPreferences();
+ bool setToDefaultPreferences();
+
+ HRESULT setFrameLoadDelegate(IWebFrameLoadDelegate*);
HRESULT setUIDelegate(IWebUIDelegate*);
HRESULT setAccessibilityDelegate(IAccessibilityDelegate*);
IWebPreferencesPtr standardPreferences() { return m_standardPreferences; }
IWebPreferencesPrivatePtr privatePreferences() { return m_prefsPrivate; }
IWebFramePtr mainFrame();
-
- bool hasWebView() const { return !!m_webView; }
- bool usesLayeredWebView() const { return m_useLayeredWebView; }
- bool goBack();
- bool goForward();
-
-private:
+
+ bool hasWebView() const { return !!m_webView; }
+ bool usesLayeredWebView() const { return m_useLayeredWebView; }
+ bool goBack();
+ bool goForward();
+
+private:
std::vector<IWebHistoryItemPtr> m_historyItems;
-
- IWebViewPtr m_webView;
+
+ IWebViewPtr m_webView;
IWebViewPrivatePtr m_webViewPrivate;
-
- IWebHistoryPtr m_webHistory;
- IWebInspectorPtr m_inspector;
+
+ IWebHistoryPtr m_webHistory;
+ IWebInspectorPtr m_inspector;
IWebPreferencesPtr m_standardPreferences;
IWebPreferencesPrivatePtr m_prefsPrivate;
-
- IWebFrameLoadDelegatePtr m_frameLoadDelegate;
- IWebUIDelegatePtr m_uiDelegate;
- IAccessibilityDelegatePtr m_accessibilityDelegate;
-
- HWND m_hMainWnd;
+
+ IWebFrameLoadDelegatePtr m_frameLoadDelegate;
+ IWebUIDelegatePtr m_uiDelegate;
+ IAccessibilityDelegatePtr m_accessibilityDelegate;
+
+ HWND m_hMainWnd;
HWND m_hURLBarWnd;
-
- bool m_useLayeredWebView;
-};
+
+ bool m_useLayeredWebView;
+};
