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

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

Issue 8417043: Add webkit_glue namespace. Improve some variable and test names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error 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 2573 matching lines...) Expand 10 before | Expand all | Expand 10 after
2584 2584
2585 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents)) 2585 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableWebIntents))
2586 return; 2586 return;
2587 2587
2588 GURL service_url(href); 2588 GURL service_url(href);
2589 if (!service_url.is_valid()) { 2589 if (!service_url.is_valid()) {
2590 const GURL& url = tab->GetURL(); 2590 const GURL& url = tab->GetURL();
2591 service_url = url.Resolve(href); 2591 service_url = url.Resolve(href);
2592 } 2592 }
2593 2593
2594 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 InfoBarTabHelper* infobar_helper = tcw->infobar_tab_helper();
2602 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate( 2602 infobar_helper->AddInfoBar(new RegisterIntentHandlerInfoBarDelegate(
2603 infobar_helper, 2603 infobar_helper,
2604 WebIntentsRegistryFactory::GetForProfile(tcw->profile()), 2604 WebIntentsRegistryFactory::GetForProfile(tcw->profile()),
(...skipping 2897 matching lines...) Expand 10 before | Expand all | Expand 10 after
5502 } 5502 }
5503 5503
5504 void Browser::UpdateFullscreenExitBubbleContent() { 5504 void Browser::UpdateFullscreenExitBubbleContent() {
5505 GURL url; 5505 GURL url;
5506 if (fullscreened_tab_) 5506 if (fullscreened_tab_)
5507 url = fullscreened_tab_->tab_contents()->GetURL(); 5507 url = fullscreened_tab_->tab_contents()->GetURL();
5508 5508
5509 window_->UpdateFullscreenExitBubbleContent( 5509 window_->UpdateFullscreenExitBubbleContent(
5510 url, GetFullscreenExitBubbleType()); 5510 url, GetFullscreenExitBubbleType());
5511 } 5511 }
OLDNEW
« no previous file with comments | « chrome/browser/intents/web_intents_registry_unittest.cc ('k') | chrome/browser/ui/intents/web_intent_picker_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698