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 |
| 13 #include <string> |
12 #include <vector> | 14 #include <vector> |
13 #include <string> | 15 |
14 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
15 #include "base/scoped_comptr_win.h" | |
16 #include "base/time.h" | 17 #include "base/time.h" |
| 18 #include "base/win/scoped_comptr.h" |
17 #include "chrome/common/automation_constants.h" | 19 #include "chrome/common/automation_constants.h" |
18 #include "chrome_frame/cfproxy.h" | 20 #include "chrome_frame/cfproxy.h" |
19 #include "chrome_frame/task_marshaller.h" | 21 #include "chrome_frame/task_marshaller.h" |
20 #include "content/common/page_zoom.h" | 22 #include "content/common/page_zoom.h" |
21 #include "googleurl/src/gurl.h" | 23 #include "googleurl/src/gurl.h" |
22 | 24 |
23 class Task; | 25 class Task; |
24 class CancelableTask; | 26 class CancelableTask; |
25 | 27 |
26 namespace base { | 28 namespace base { |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 GURL url; | 219 GURL url; |
218 GURL referrer; | 220 GURL referrer; |
219 void Set(const GURL& gurl, const GURL& ref) { | 221 void Set(const GURL& gurl, const GURL& ref) { |
220 url = gurl; | 222 url = gurl; |
221 referrer = ref; | 223 referrer = ref; |
222 } | 224 } |
223 } pending_navigation_; | 225 } pending_navigation_; |
224 }; | 226 }; |
225 | 227 |
226 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ | 228 #endif // CHROME_FRAME_EXTERNAL_TAB_H_ |
OLD | NEW |