OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 const FileChooserParams& params) OVERRIDE; | 413 const FileChooserParams& params) OVERRIDE; |
414 virtual void ToggleFullscreenMode(bool enter_fullscreen) OVERRIDE; | 414 virtual void ToggleFullscreenMode(bool enter_fullscreen) OVERRIDE; |
415 virtual bool IsFullscreenForCurrentTab() const OVERRIDE; | 415 virtual bool IsFullscreenForCurrentTab() const OVERRIDE; |
416 virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE; | 416 virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE; |
417 virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE; | 417 virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE; |
418 virtual void RequestToLockMouse(bool user_gesture, | 418 virtual void RequestToLockMouse(bool user_gesture, |
419 bool last_unlocked_by_target) OVERRIDE; | 419 bool last_unlocked_by_target) OVERRIDE; |
420 virtual void LostMouseLock() OVERRIDE; | 420 virtual void LostMouseLock() OVERRIDE; |
421 virtual void CreateNewWindow( | 421 virtual void CreateNewWindow( |
422 int route_id, | 422 int route_id, |
| 423 int main_frame_route_id, |
423 const ViewHostMsg_CreateWindow_Params& params, | 424 const ViewHostMsg_CreateWindow_Params& params, |
424 SessionStorageNamespace* session_storage_namespace) OVERRIDE; | 425 SessionStorageNamespace* session_storage_namespace) OVERRIDE; |
425 virtual void CreateNewWidget(int route_id, | 426 virtual void CreateNewWidget(int route_id, |
426 WebKit::WebPopupType popup_type) OVERRIDE; | 427 WebKit::WebPopupType popup_type) OVERRIDE; |
427 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; | 428 virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; |
428 virtual void ShowCreatedWindow(int route_id, | 429 virtual void ShowCreatedWindow(int route_id, |
429 WindowOpenDisposition disposition, | 430 WindowOpenDisposition disposition, |
430 const gfx::Rect& initial_pos, | 431 const gfx::Rect& initial_pos, |
431 bool user_gesture) OVERRIDE; | 432 bool user_gesture) OVERRIDE; |
432 virtual void ShowCreatedWidget(int route_id, | 433 virtual void ShowCreatedWidget(int route_id, |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
936 // Maps the ids of pending image downloads to their callbacks | 937 // Maps the ids of pending image downloads to their callbacks |
937 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; | 938 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; |
938 ImageDownloadMap image_download_map_; | 939 ImageDownloadMap image_download_map_; |
939 | 940 |
940 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); | 941 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); |
941 }; | 942 }; |
942 | 943 |
943 } // namespace content | 944 } // namespace content |
944 | 945 |
945 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 946 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |