| 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 3370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3381 | 3381 |
| 3382 /////////////////////////////////////////////////////////////////////////////// | 3382 /////////////////////////////////////////////////////////////////////////////// |
| 3383 // Browser, TabContentsDelegate implementation: | 3383 // Browser, TabContentsDelegate implementation: |
| 3384 | 3384 |
| 3385 TabContents* Browser::OpenURLFromTab(TabContents* source, | 3385 TabContents* Browser::OpenURLFromTab(TabContents* source, |
| 3386 const OpenURLParams& params) { | 3386 const OpenURLParams& params) { |
| 3387 browser::NavigateParams nav_params(this, params.url, params.transition); | 3387 browser::NavigateParams nav_params(this, params.url, params.transition); |
| 3388 nav_params.source_contents = | 3388 nav_params.source_contents = |
| 3389 tabstrip_model()->GetTabContentsAt( | 3389 tabstrip_model()->GetTabContentsAt( |
| 3390 tabstrip_model()->GetWrapperIndex(source)); | 3390 tabstrip_model()->GetWrapperIndex(source)); |
| 3391 nav_params.referrer = params.referrer.url; | 3391 nav_params.referrer = params.referrer; |
| 3392 nav_params.disposition = params.disposition; | 3392 nav_params.disposition = params.disposition; |
| 3393 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; | 3393 nav_params.tabstrip_add_types = TabStripModel::ADD_NONE; |
| 3394 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; | 3394 nav_params.window_action = browser::NavigateParams::SHOW_WINDOW; |
| 3395 nav_params.user_gesture = true; | 3395 nav_params.user_gesture = true; |
| 3396 nav_params.override_encoding = params.override_encoding; | 3396 nav_params.override_encoding = params.override_encoding; |
| 3397 nav_params.is_renderer_initiated = params.is_renderer_initiated; | 3397 nav_params.is_renderer_initiated = params.is_renderer_initiated; |
| 3398 nav_params.transferred_global_request_id = | 3398 nav_params.transferred_global_request_id = |
| 3399 params.transferred_global_request_id; | 3399 params.transferred_global_request_id; |
| 3400 browser::Navigate(&nav_params); | 3400 browser::Navigate(&nav_params); |
| 3401 | 3401 |
| (...skipping 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5326 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); | 5326 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); |
| 5327 } else { | 5327 } else { |
| 5328 GlobalErrorService* service = | 5328 GlobalErrorService* service = |
| 5329 GlobalErrorServiceFactory::GetForProfile(profile()); | 5329 GlobalErrorServiceFactory::GetForProfile(profile()); |
| 5330 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); | 5330 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); |
| 5331 if (error) { | 5331 if (error) { |
| 5332 error->ShowBubbleView(this); | 5332 error->ShowBubbleView(this); |
| 5333 } | 5333 } |
| 5334 } | 5334 } |
| 5335 } | 5335 } |
| OLD | NEW |