Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: chrome_frame/chrome_active_document.h

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/cfproxy_private.h ('k') | chrome_frame/chrome_active_document.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_CHROME_ACTIVE_DOCUMENT_H_ 5 #ifndef CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
6 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_ 6 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <atlctl.h> 10 #include <atlctl.h>
11 #include <htiframe.h> 11 #include <htiframe.h>
12 #include <mshtmcid.h> 12 #include <mshtmcid.h>
13 #include <perhist.h> 13 #include <perhist.h>
14 14
15 #include <map> 15 #include <map>
16 #include <string> 16 #include <string>
17 17
18 #include "base/scoped_ptr.h" 18 #include "base/scoped_ptr.h"
19 #include "base/scoped_comptr_win.h" 19 #include "base/scoped_comptr_win.h"
20 #include "base/thread.h" 20 #include "base/threading/thread.h"
21 21
22 #include "chrome_frame/chrome_frame_activex_base.h" 22 #include "chrome_frame/chrome_frame_activex_base.h"
23 #include "chrome_frame/com_type_info_holder.h" 23 #include "chrome_frame/com_type_info_holder.h"
24 #include "chrome_frame/find_dialog.h" 24 #include "chrome_frame/find_dialog.h"
25 #include "chrome_frame/html_private_window_impl.h" 25 #include "chrome_frame/html_private_window_impl.h"
26 #include "chrome_frame/html_window_impl.h" 26 #include "chrome_frame/html_window_impl.h"
27 #include "chrome_frame/in_place_menu.h" 27 #include "chrome_frame/in_place_menu.h"
28 #include "chrome_frame/ole_document_impl.h" 28 #include "chrome_frame/ole_document_impl.h"
29 #include "chrome_frame/resource.h" 29 #include "chrome_frame/resource.h"
30 #include "chrome_frame/extra_system_apis.h" 30 #include "chrome_frame/extra_system_apis.h"
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator 480 UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
481 next_privacy_record_; 481 next_privacy_record_;
482 482
483 // Dimensions of the window. Used only when opening popups. 483 // Dimensions of the window. Used only when opening popups.
484 gfx::Rect dimensions_; 484 gfx::Rect dimensions_;
485 public: 485 public:
486 OLEINPLACEFRAMEINFO frame_info_; 486 OLEINPLACEFRAMEINFO frame_info_;
487 }; 487 };
488 488
489 #endif // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_ 489 #endif // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
OLDNEW
« no previous file with comments | « chrome_frame/cfproxy_private.h ('k') | chrome_frame/chrome_active_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698