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

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: Fix up merge 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 2580 matching lines...) Expand 10 before | Expand all | Expand 10 after
2591 service_url = url.Resolve(href); 2591 service_url = url.Resolve(href);
2592 } 2592 }
2593 2593
2594 webkit_glue::WebIntentServiceData service; 2594 webkit_glue::WebIntentServiceData service;
2595 service.service_url = service_url; 2595 service.service_url = service_url;
2596 service.action = action; 2596 service.action = action;
2597 service.type = type; 2597 service.type = type;
2598 service.title = title; 2598 service.title = title;
2599 service.setDisposition(disposition); 2599 service.setDisposition(disposition);
2600 2600
2601 InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper(); 2601 RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
2602 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( 2602 tcw->infobar_tab_helper(),
2603 infobar_helper,
2604 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), 2603 WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
2605 service)); 2604 service);
2606 } 2605 }
2607 2606
2608 // static 2607 // static
2609 void Browser::FindReplyHelper(TabContents* tab, 2608 void Browser::FindReplyHelper(TabContents* tab,
2610 int request_id, 2609 int request_id,
2611 int number_of_matches, 2610 int number_of_matches,
2612 const gfx::Rect& selection_rect, 2611 const gfx::Rect& selection_rect,
2613 int active_match_ordinal, 2612 int active_match_ordinal,
2614 bool final_update) { 2613 bool final_update) {
2615 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents( 2614 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
(...skipping 2891 matching lines...) Expand 10 before | Expand all | Expand 10 after
5507 } 5506 }
5508 5507
5509 void Browser::UpdateFullscreenExitBubbleContent() { 5508 void Browser::UpdateFullscreenExitBubbleContent() {
5510 GURL url; 5509 GURL url;
5511 if (fullscreened_tab_) 5510 if (fullscreened_tab_)
5512 url = fullscreened_tab_->tab_contents()->GetURL(); 5511 url = fullscreened_tab_->tab_contents()->GetURL();
5513 5512
5514 window_->UpdateFullscreenExitBubbleContent( 5513 window_->UpdateFullscreenExitBubbleContent(
5515 url, GetFullscreenExitBubbleType()); 5514 url, GetFullscreenExitBubbleType());
5516 } 5515 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698