Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 8144013: Add a check to the registry before the intent infobar is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More updates Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 2579 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 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 RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
2601 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( 2601 tcw->infobar_tab_helper(),
2602 infobar_helper,
2603 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), 2602 WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
2604 service)); 2603 service);
2605 } 2604 }
2606 2605
2607 // static 2606 // static
2608 void Browser::FindReplyHelper(TabContents* tab, 2607 void Browser::FindReplyHelper(TabContents* tab,
2609 int request_id, 2608 int request_id,
2610 int number_of_matches, 2609 int number_of_matches,
2611 const gfx::Rect& selection_rect, 2610 const gfx::Rect& selection_rect,
2612 int active_match_ordinal, 2611 int active_match_ordinal,
2613 bool final_update) { 2612 bool final_update) {
2614 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents( 2613 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
(...skipping 2900 matching lines...) Expand 10 before | Expand all | Expand 10 after
5515 } 5514 }
5516 5515
5517 void Browser::UpdateFullscreenExitBubbleContent() { 5516 void Browser::UpdateFullscreenExitBubbleContent() {
5518 GURL url; 5517 GURL url;
5519 if (fullscreened_tab_) 5518 if (fullscreened_tab_)
5520 url = fullscreened_tab_->tab_contents()->GetURL(); 5519 url = fullscreened_tab_->tab_contents()->GetURL();
5521 5520
5522 window_->UpdateFullscreenExitBubbleContent( 5521 window_->UpdateFullscreenExitBubbleContent(
5523 url, GetFullscreenExitBubbleType()); 5522 url, GetFullscreenExitBubbleType());
5524 } 5523 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698