| 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 3358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3369 nav_params.source_contents = | 3369 nav_params.source_contents = |
| 3370 tabstrip_model()->GetTabContentsAt( | 3370 tabstrip_model()->GetTabContentsAt( |
| 3371 tabstrip_model()->GetWrapperIndex(source)); | 3371 tabstrip_model()->GetWrapperIndex(source)); |
| 3372 nav_params.referrer = params.referrer; | 3372 nav_params.referrer = params.referrer; |
| 3373 nav_params.disposition = params.disposition; | 3373 nav_params.disposition = params.disposition; |
| 3374 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; | 3374 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; |
| 3375 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; | 3375 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; |
| 3376 nav_params.user_gesture = true; | 3376 nav_params.user_gesture = true; |
| 3377 nav_params.override_encoding = params.override_encoding; | 3377 nav_params.override_encoding = params.override_encoding; |
| 3378 nav_params.is_renderer_initiated = params.is_renderer_initiated; | 3378 nav_params.is_renderer_initiated = params.is_renderer_initiated; |
| 3379 nav_params.opener_browsing_instance_frame_id = |
| 3380 params.opener_browsing_instance_frame_id; |
| 3379 browser::Navigate(&nav_params); | 3381 browser::Navigate(&nav_params); |
| 3380 | 3382 |
| 3381 return nav_params.target_contents ? | 3383 return nav_params.target_contents ? |
| 3382 nav_params.target_contents->tab_contents() : NULL; | 3384 nav_params.target_contents->tab_contents() : NULL; |
| 3383 } | 3385 } |
| 3384 | 3386 |
| 3385 void Browser::NavigationStateChanged(const TabContents* source, | 3387 void Browser::NavigationStateChanged(const TabContents* source, |
| 3386 unsigned changed_flags) { | 3388 unsigned changed_flags) { |
| 3387 // Only update the UI when something visible has changed. | 3389 // Only update the UI when something visible has changed. |
| 3388 if (changed_flags) | 3390 if (changed_flags) |
| (...skipping 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5308 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5310 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5309 } else { | 5311 } else { |
| 5310 GlobalErrorService* service = | 5312 GlobalErrorService* service = |
| 5311 GlobalErrorServiceFactory::GetForProfile(profile()); | 5313 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5312 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5314 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5313 if (error) { | 5315 if (error) { |
| 5314 error->ShowBubbleView(this); | 5316 error->ShowBubbleView(this); |
| 5315 } | 5317 } |
| 5316 } | 5318 } |
| 5317 } | 5319 } |
| OLD | NEW |