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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 3387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3398 nav_params.source_contents = | 3398 nav_params.source_contents = |
3399 tabstrip_model()->GetTabContentsAt( | 3399 tabstrip_model()->GetTabContentsAt( |
3400 tabstrip_model()->GetWrapperIndex(source)); | 3400 tabstrip_model()->GetWrapperIndex(source)); |
3401 nav_params.referrer = params.referrer; | 3401 nav_params.referrer = params.referrer; |
3402 nav_params.disposition = params.disposition; | 3402 nav_params.disposition = params.disposition; |
3403 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; | 3403 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; |
3404 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; | 3404 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; |
3405 nav_params.user_gesture = true; | 3405 nav_params.user_gesture = true; |
3406 nav_params.override_encoding = params.override_encoding; | 3406 nav_params.override_encoding = params.override_encoding; |
3407 nav_params.is_renderer_initiated = params.is_renderer_initiated; | 3407 nav_params.is_renderer_initiated = params.is_renderer_initiated; |
| 3408 nav_params.opener_browsing_instance_frame_id = |
| 3409 params.opener_browsing_instance_frame_id; |
3408 nav_params.transferred_global_request_id = | 3410 nav_params.transferred_global_request_id = |
3409 params.transferred_global_request_id; | 3411 params.transferred_global_request_id; |
3410 browser::Navigate(&nav_params); | 3412 browser::Navigate(&nav_params); |
3411 | 3413 |
3412 return nav_params.target_contents ? | 3414 return nav_params.target_contents ? |
3413 nav_params.target_contents->tab_contents() : NULL; | 3415 nav_params.target_contents->tab_contents() : NULL; |
3414 } | 3416 } |
3415 | 3417 |
3416 void Browser::NavigationStateChanged(const TabContents* source, | 3418 void Browser::NavigationStateChanged(const TabContents* source, |
3417 unsigned changed_flags) { | 3419 unsigned changed_flags) { |
(...skipping 1915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5333 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5335 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
5334 } else { | 5336 } else { |
5335 GlobalErrorService* service = | 5337 GlobalErrorService* service = |
5336 GlobalErrorServiceFactory::GetForProfile(profile()); | 5338 GlobalErrorServiceFactory::GetForProfile(profile()); |
5337 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5339 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
5338 if (error) { | 5340 if (error) { |
5339 error->ShowBubbleView(this); | 5341 error->ShowBubbleView(this); |
5340 } | 5342 } |
5341 } | 5343 } |
5342 } | 5344 } |
OLD | NEW |