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 #include "content/browser/renderer_host/render_view_host.h" | 5 #include "content/browser/renderer_host/render_view_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
243 | 243 |
244 void RenderViewHost::NavigateToURL(const GURL& url) { | 244 void RenderViewHost::NavigateToURL(const GURL& url) { |
245 ViewMsg_Navigate_Params params; | 245 ViewMsg_Navigate_Params params; |
246 params.page_id = -1; | 246 params.page_id = -1; |
247 params.pending_history_list_offset = -1; | 247 params.pending_history_list_offset = -1; |
248 params.current_history_list_offset = -1; | 248 params.current_history_list_offset = -1; |
249 params.current_history_list_length = 0; | 249 params.current_history_list_length = 0; |
250 params.url = url; | 250 params.url = url; |
251 params.transition = PageTransition::LINK; | 251 params.transition = PageTransition::LINK; |
252 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; | 252 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; |
253 DCHECK(delegate_); | |
brettw
2011/05/18 22:11:38
This assertion isn't really helping since if it fa
Shishir
2011/05/20 03:48:19
Removed.
| |
254 params.is_hidden = delegate_->IsHidden(); | |
253 Navigate(params); | 255 Navigate(params); |
254 } | 256 } |
255 | 257 |
256 void RenderViewHost::SetNavigationsSuspended(bool suspend) { | 258 void RenderViewHost::SetNavigationsSuspended(bool suspend) { |
257 // This should only be called to toggle the state. | 259 // This should only be called to toggle the state. |
258 DCHECK(navigations_suspended_ != suspend); | 260 DCHECK(navigations_suspended_ != suspend); |
259 | 261 |
260 navigations_suspended_ = suspend; | 262 navigations_suspended_ = suspend; |
261 if (!suspend && suspended_nav_message_.get()) { | 263 if (!suspend && suspended_nav_message_.get()) { |
262 // There's a navigation message waiting to be sent. Now that we're not | 264 // There's a navigation message waiting to be sent. Now that we're not |
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1426 if (view) { | 1428 if (view) { |
1427 view->ShowPopupMenu(params.bounds, | 1429 view->ShowPopupMenu(params.bounds, |
1428 params.item_height, | 1430 params.item_height, |
1429 params.item_font_size, | 1431 params.item_font_size, |
1430 params.selected_item, | 1432 params.selected_item, |
1431 params.popup_items, | 1433 params.popup_items, |
1432 params.right_aligned); | 1434 params.right_aligned); |
1433 } | 1435 } |
1434 } | 1436 } |
1435 #endif | 1437 #endif |
OLD | NEW |