| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_FRAME_EXTERNAL_TAB_H_ | 5 #ifndef CHROME_FRAME_EXTERNAL_TAB_H_ |
| 6 #define CHROME_FRAME_EXTERNAL_TAB_H_ | 6 #define CHROME_FRAME_EXTERNAL_TAB_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #include <atlbase.h> | 10 #include <atlbase.h> |
| 11 #include <atlwin.h> | 11 #include <atlwin.h> |
| 12 | 12 |
| 13 #include <string> | 13 #include <string> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/time.h" | 17 #include "base/time.h" |
| 18 #include "base/win/scoped_comptr.h" | 18 #include "base/win/scoped_comptr.h" |
| 19 #include "chrome/common/automation_constants.h" | 19 #include "chrome/common/automation_constants.h" |
| 20 #include "chrome_frame/cfproxy.h" | 20 #include "chrome_frame/cfproxy.h" |
| 21 #include "chrome_frame/task_marshaller.h" | 21 #include "chrome_frame/task_marshaller.h" |
| 22 #include "content/common/page_zoom.h" | 22 #include "content/public/common/page_zoom.h" |
| 23 #include "googleurl/src/gurl.h" | 23 #include "googleurl/src/gurl.h" |
| 24 | 24 |
| 25 class Task; | 25 class Task; |
| 26 class CancelableTask; | 26 class CancelableTask; |
| 27 | 27 |
| 28 namespace base { | 28 namespace base { |
| 29 class TimeDelta; | 29 class TimeDelta; |
| 30 class WaitableEvent; | 30 class WaitableEvent; |
| 31 } | 31 } |
| 32 | 32 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 NavigationConstraints* navigation_constraints); | 109 NavigationConstraints* navigation_constraints); |
| 110 virtual void NavigateToIndex(int index); | 110 virtual void NavigateToIndex(int index); |
| 111 virtual void ForwardMessageFromExternalHost(const std::string& message, | 111 virtual void ForwardMessageFromExternalHost(const std::string& message, |
| 112 const std::string& origin, const std::string& target); | 112 const std::string& origin, const std::string& target); |
| 113 virtual void ChromeFrameHostMoved(); | 113 virtual void ChromeFrameHostMoved(); |
| 114 | 114 |
| 115 // Attaches an existing external tab to this automation client instance. | 115 // Attaches an existing external tab to this automation client instance. |
| 116 virtual void ConnectToExternalTab(uint64 external_tab_cookie); | 116 virtual void ConnectToExternalTab(uint64 external_tab_cookie); |
| 117 virtual void BlockExternalTab(uint64 cookie); | 117 virtual void BlockExternalTab(uint64 cookie); |
| 118 | 118 |
| 119 void SetZoomLevel(PageZoom::Function zoom_level); | 119 void SetZoomLevel(content::PageZoom zoom_level); |
| 120 | 120 |
| 121 private: | 121 private: |
| 122 BEGIN_MSG_MAP(ExternalTabProxy) | 122 BEGIN_MSG_MAP(ExternalTabProxy) |
| 123 CHAIN_MSG_MAP_MEMBER(ui_); | 123 CHAIN_MSG_MAP_MEMBER(ui_); |
| 124 END_MSG_MAP() | 124 END_MSG_MAP() |
| 125 | 125 |
| 126 ////////////////////////////////////////////////////////////////////////// | 126 ////////////////////////////////////////////////////////////////////////// |
| 127 // ChromeProxyDelegate implementation | 127 // ChromeProxyDelegate implementation |
| 128 virtual int tab_handle() { | 128 virtual int tab_handle() { |
| 129 return tab_; | 129 return tab_; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 GURL url; | 218 GURL url; |
| 219 GURL referrer; | 219 GURL referrer; |
| 220 void Set(const GURL& gurl, const GURL& ref) { | 220 void Set(const GURL& gurl, const GURL& ref) { |
| 221 url = gurl; | 221 url = gurl; |
| 222 referrer = ref; | 222 referrer = ref; |
| 223 } | 223 } |
| 224 } pending_navigation_; | 224 } pending_navigation_; |
| 225 }; | 225 }; |
| 226 | 226 |
| 227 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ | 227 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ |
| OLD | NEW |