OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include <vector> | 12 #include <vector> |
13 #include <string> | 13 #include <string> |
14 #include "base/scoped_comptr_win.h" | 14 #include "base/scoped_comptr_win.h" |
15 #include "base/scoped_ptr.h" | 15 #include "base/scoped_ptr.h" |
16 #include "base/time.h" | 16 #include "base/time.h" |
17 #include "chrome/common/automation_constants.h" | 17 #include "chrome/common/automation_constants.h" |
18 #include "chrome/common/page_zoom.h" | |
19 #include "chrome_frame/cfproxy.h" | 18 #include "chrome_frame/cfproxy.h" |
20 #include "chrome_frame/task_marshaller.h" | 19 #include "chrome_frame/task_marshaller.h" |
| 20 #include "content/common/page_zoom.h" |
21 #include "googleurl/src/gurl.h" | 21 #include "googleurl/src/gurl.h" |
22 | 22 |
23 class Task; | 23 class Task; |
24 class CancelableTask; | 24 class CancelableTask; |
25 | 25 |
26 namespace base { | 26 namespace base { |
27 class TimeDelta; | 27 class TimeDelta; |
28 class WaitableEvent; | 28 class WaitableEvent; |
29 } | 29 } |
30 | 30 |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 GURL url; | 223 GURL url; |
224 GURL referrer; | 224 GURL referrer; |
225 void Set(const GURL& gurl, const GURL& ref) { | 225 void Set(const GURL& gurl, const GURL& ref) { |
226 url = gurl; | 226 url = gurl; |
227 referrer = ref; | 227 referrer = ref; |
228 } | 228 } |
229 } pending_navigation_; | 229 } pending_navigation_; |
230 }; | 230 }; |
231 | 231 |
232 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ | 232 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ |
OLD | NEW |