| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_BROWSER_WEB_CONTENTS_VIEW_H_ | 5 #ifndef CHROME_BROWSER_WEB_CONTENTS_VIEW_H_ |
| 6 #define CHROME_BROWSER_WEB_CONTENTS_VIEW_H_ | 6 #define CHROME_BROWSER_WEB_CONTENTS_VIEW_H_ |
| 7 | 7 |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 // interface. Subclasses should implement this rather than the corresponding | 165 // interface. Subclasses should implement this rather than the corresponding |
| 166 // ...::View functions directly, since the routing stuff will already be | 166 // ...::View functions directly, since the routing stuff will already be |
| 167 // computed. They should implement the rest of the functions as normal. | 167 // computed. They should implement the rest of the functions as normal. |
| 168 // | 168 // |
| 169 // The only difference is that the Create functions return the newly | 169 // The only difference is that the Create functions return the newly |
| 170 // created objects so that they can be associated with the given routes. When | 170 // created objects so that they can be associated with the given routes. When |
| 171 // they are shown later, we'll look them up again and pass the objects to | 171 // they are shown later, we'll look them up again and pass the objects to |
| 172 // the Show functions rather than the route ID. | 172 // the Show functions rather than the route ID. |
| 173 virtual WebContents* CreateNewWindowInternal(int route_id, | 173 virtual WebContents* CreateNewWindowInternal(int route_id, |
| 174 HANDLE modal_dialog_event) = 0; | 174 HANDLE modal_dialog_event) = 0; |
| 175 virtual RenderWidgetHostView* CreateNewWidgetInternal(int route_id) = 0; | 175 virtual RenderWidgetHostView* CreateNewWidgetInternal(int route_id, |
| 176 bool focus_on_show) = 0; |
| 176 virtual void ShowCreatedWindowInternal(WebContents* new_web_contents, | 177 virtual void ShowCreatedWindowInternal(WebContents* new_web_contents, |
| 177 WindowOpenDisposition disposition, | 178 WindowOpenDisposition disposition, |
| 178 const gfx::Rect& initial_pos, | 179 const gfx::Rect& initial_pos, |
| 179 bool user_gesture) = 0; | 180 bool user_gesture) = 0; |
| 180 virtual void ShowCreatedWidgetInternal(RenderWidgetHostView* widget_host_view, | 181 virtual void ShowCreatedWidgetInternal(RenderWidgetHostView* widget_host_view, |
| 181 const gfx::Rect& initial_pos) = 0; | 182 const gfx::Rect& initial_pos) = 0; |
| 182 | 183 |
| 183 private: | 184 private: |
| 184 // We implement these functions on RenderViewHostDelegate::View directly and | 185 // We implement these functions on RenderViewHostDelegate::View directly and |
| 185 // do some book-keeping associated with the request. The request is then | 186 // do some book-keeping associated with the request. The request is then |
| 186 // forwarded to *Internal which does platform-specific work. | 187 // forwarded to *Internal which does platform-specific work. |
| 187 virtual void CreateNewWindow(int route_id, HANDLE modal_dialog_event); | 188 virtual void CreateNewWindow(int route_id, HANDLE modal_dialog_event); |
| 188 virtual void CreateNewWidget(int route_id); | 189 virtual void CreateNewWidget(int route_id, |
| 190 bool focus_on_show); |
| 189 virtual void ShowCreatedWindow(int route_id, | 191 virtual void ShowCreatedWindow(int route_id, |
| 190 WindowOpenDisposition disposition, | 192 WindowOpenDisposition disposition, |
| 191 const gfx::Rect& initial_pos, | 193 const gfx::Rect& initial_pos, |
| 192 bool user_gesture); | 194 bool user_gesture); |
| 193 virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); | 195 virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); |
| 194 | 196 |
| 195 // Tracks created WebContents objects that have not been shown yet. They are | 197 // Tracks created WebContents objects that have not been shown yet. They are |
| 196 // identified by the route ID passed to CreateNewWindow. | 198 // identified by the route ID passed to CreateNewWindow. |
| 197 typedef std::map<int, WebContents*> PendingContents; | 199 typedef std::map<int, WebContents*> PendingContents; |
| 198 PendingContents pending_contents_; | 200 PendingContents pending_contents_; |
| 199 | 201 |
| 200 // These maps hold on to the widgets that we created on behalf of the | 202 // These maps hold on to the widgets that we created on behalf of the |
| 201 // renderer that haven't shown yet. | 203 // renderer that haven't shown yet. |
| 202 typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews; | 204 typedef std::map<int, RenderWidgetHostView*> PendingWidgetViews; |
| 203 PendingWidgetViews pending_widget_views_; | 205 PendingWidgetViews pending_widget_views_; |
| 204 | 206 |
| 205 DISALLOW_COPY_AND_ASSIGN(WebContentsView); | 207 DISALLOW_COPY_AND_ASSIGN(WebContentsView); |
| 206 }; | 208 }; |
| 207 | 209 |
| 208 #endif // CHROME_BROWSER_WEB_CONTENTS_VIEW_H_ | 210 #endif // CHROME_BROWSER_WEB_CONTENTS_VIEW_H_ |
| OLD | NEW |