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

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 provider to service in comments. 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 2575 matching lines...) Expand 10 before | Expand all | Expand 10 after
2586 service_url = url.Resolve(href); 2586 service_url = url.Resolve(href);
2587 } 2587 }
2588 2588
2589 webkit_glue::WebIntentServiceData service; 2589 webkit_glue::WebIntentServiceData service;
2590 service.service_url = service_url; 2590 service.service_url = service_url;
2591 service.action = action; 2591 service.action = action;
2592 service.type = type; 2592 service.type = type;
2593 service.title = title; 2593 service.title = title;
2594 service.setDisposition(disposition); 2594 service.setDisposition(disposition);
2595 2595
2596 InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper(); 2596 RegisterIntentHandlerInfoBarDelegate::MaybeShowIntentInfoBar(
2597 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( 2597 tcw->infobar_tab_helper(),
2598 infobar_helper,
2599 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), 2598 WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
2600 service)); 2599 service);
2601 } 2600 }
2602 2601
2603 // static 2602 // static
2604 void Browser::FindReplyHelper(TabContents* tab, 2603 void Browser::FindReplyHelper(TabContents* tab,
2605 int request_id, 2604 int request_id,
2606 int number_of_matches, 2605 int number_of_matches,
2607 const gfx::Rect& selection_rect, 2606 const gfx::Rect& selection_rect,
2608 int active_match_ordinal, 2607 int active_match_ordinal,
2609 bool final_update) { 2608 bool final_update) {
2610 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents( 2609 TabContentsWrapper* tcw = TabContentsWrapper::GetCurrentWrapperForContents(
(...skipping 2897 matching lines...) Expand 10 before | Expand all | Expand 10 after
5508 } 5507 }
5509 5508
5510 void Browser::UpdateFullscreenExitBubbleContent() { 5509 void Browser::UpdateFullscreenExitBubbleContent() {
5511 GURL url; 5510 GURL url;
5512 if (fullscreened_tab_) 5511 if (fullscreened_tab_)
5513 url = fullscreened_tab_->tab_contents()->GetURL(); 5512 url = fullscreened_tab_->tab_contents()->GetURL();
5514 5513
5515 window_->UpdateFullscreenExitBubbleContent( 5514 window_->UpdateFullscreenExitBubbleContent(
5516 url, GetFullscreenExitBubbleType()); 5515 url, GetFullscreenExitBubbleType());
5517 } 5516 }
OLDNEW
« no previous file with comments | « chrome/browser/intents/web_intents_registry.cc ('k') | chrome/browser/webdata/web_data_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698