| 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 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2585 | 2585 |
| 2586 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) | 2586 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) |
| 2587 return; | 2587 return; |
| 2588 | 2588 |
| 2589 GURL service_url(href); | 2589 GURL service_url(href); |
| 2590 if (!service_url.is_valid()) { | 2590 if (!service_url.is_valid()) { |
| 2591 const GURL& url = tab->GetURL(); | 2591 const GURL& url = tab->GetURL(); |
| 2592 service_url = url.Resolve(href); | 2592 service_url = url.Resolve(href); |
| 2593 } | 2593 } |
| 2594 | 2594 |
| 2595 WebIntentServiceData service; | 2595 webkit_glue::WebIntentServiceData service; |
| 2596 service.service_url = service_url; | 2596 service.service_url = service_url; |
| 2597 service.action = action; | 2597 service.action = action; |
| 2598 service.type = type; | 2598 service.type = type; |
| 2599 service.title = title; | 2599 service.title = title; |
| 2600 InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper(); | 2600 InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper(); |
| 2601 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( | 2601 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( |
| 2602 infobar_helper, | 2602 infobar_helper, |
| 2603 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), | 2603 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), |
| 2604 service)); | 2604 service)); |
| 2605 } | 2605 } |
| (...skipping 2909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5515 } | 5515 } |
| 5516 | 5516 |
| 5517 void Browser::UpdateFullscreenExitBubbleContent() { | 5517 void Browser::UpdateFullscreenExitBubbleContent() { |
| 5518 GURL url; | 5518 GURL url; |
| 5519 if (fullscreened_tab_) | 5519 if (fullscreened_tab_) |
| 5520 url = fullscreened_tab_->tab_contents()->GetURL(); | 5520 url = fullscreened_tab_->tab_contents()->GetURL(); |
| 5521 | 5521 |
| 5522 window_->UpdateFullscreenExitBubbleContent( | 5522 window_->UpdateFullscreenExitBubbleContent( |
| 5523 url, GetFullscreenExitBubbleType()); | 5523 url, GetFullscreenExitBubbleType()); |
| 5524 } | 5524 } |
| OLD | NEW |