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

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

Issue 176053002: [WebsiteSettings] Change permission bubble API to adapt to new mocks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add multi-download bubble changes. Created 6 years, 9 months 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 // defined(OS_WIN) 10 #endif // defined(OS_WIN)
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 // ungestured and gestured RPH calls. 1633 // ungestured and gestured RPH calls.
1634 if (window_) { 1634 if (window_) {
1635 tab_content_settings->ClearPendingProtocolHandler(); 1635 tab_content_settings->ClearPendingProtocolHandler();
1636 window_->GetLocationBar()->UpdateContentSettingsIcons(); 1636 window_->GetLocationBar()->UpdateContentSettingsIcons();
1637 } 1637 }
1638 1638
1639 PermissionBubbleManager* bubble_manager = 1639 PermissionBubbleManager* bubble_manager =
1640 PermissionBubbleManager::FromWebContents(web_contents); 1640 PermissionBubbleManager::FromWebContents(web_contents);
1641 if (PermissionBubbleManager::Enabled() && bubble_manager) { 1641 if (PermissionBubbleManager::Enabled() && bubble_manager) {
1642 bubble_manager->AddRequest( 1642 bubble_manager->AddRequest(
1643 new RegisterProtocolHandlerPermissionRequest(registry, handler)); 1643 new RegisterProtocolHandlerPermissionRequest(registry, handler,
1644 url, user_gesture));
1644 } else { 1645 } else {
1645 RegisterProtocolHandlerInfoBarDelegate::Create( 1646 RegisterProtocolHandlerInfoBarDelegate::Create(
1646 InfoBarService::FromWebContents(web_contents), registry, handler); 1647 InfoBarService::FromWebContents(web_contents), registry, handler);
1647 } 1648 }
1648 } 1649 }
1649 1650
1650 void Browser::UpdatePreferredSize(WebContents* source, 1651 void Browser::UpdatePreferredSize(WebContents* source,
1651 const gfx::Size& pref_size) { 1652 const gfx::Size& pref_size) {
1652 window_->UpdatePreferredSize(source, pref_size); 1653 window_->UpdatePreferredSize(source, pref_size);
1653 } 1654 }
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2322 if (contents && !allow_js_access) { 2323 if (contents && !allow_js_access) {
2323 contents->web_contents()->GetController().LoadURL( 2324 contents->web_contents()->GetController().LoadURL(
2324 target_url, 2325 target_url,
2325 content::Referrer(), 2326 content::Referrer(),
2326 content::PAGE_TRANSITION_LINK, 2327 content::PAGE_TRANSITION_LINK,
2327 std::string()); // No extra headers. 2328 std::string()); // No extra headers.
2328 } 2329 }
2329 2330
2330 return contents != NULL; 2331 return contents != NULL;
2331 } 2332 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698