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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 305103003: Fix for 'Simple Adblock' extension crashes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderProcessHost can be a mock in unittests Created 6 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 MEDIA_DEVICE_INVALID_STATE, 1632 MEDIA_DEVICE_INVALID_STATE,
1633 scoped_ptr<MediaStreamUI>()); 1633 scoped_ptr<MediaStreamUI>());
1634 } 1634 }
1635 } 1635 }
1636 1636
1637 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( 1637 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace(
1638 SiteInstance* instance) { 1638 SiteInstance* instance) {
1639 return controller_.GetSessionStorageNamespace(instance); 1639 return controller_.GetSessionStorageNamespace(instance);
1640 } 1640 }
1641 1641
1642 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() {
1643 return controller_.GetSessionStorageNamespaceMap();
1644 }
1645
1642 FrameTree* WebContentsImpl::GetFrameTree() { 1646 FrameTree* WebContentsImpl::GetFrameTree() {
1643 return &frame_tree_; 1647 return &frame_tree_;
1644 } 1648 }
1645 1649
1646 void WebContentsImpl::AccessibilityEventReceived( 1650 void WebContentsImpl::AccessibilityEventReceived(
1647 const std::vector<AXEventNotificationDetails>& details) { 1651 const std::vector<AXEventNotificationDetails>& details) {
1648 FOR_EACH_OBSERVER( 1652 FOR_EACH_OBSERVER(
1649 WebContentsObserver, observers_, AccessibilityEventReceived(details)); 1653 WebContentsObserver, observers_, AccessibilityEventReceived(details));
1650 } 1654 }
1651 1655
(...skipping 2414 matching lines...) Expand 10 before | Expand all | Expand 10 after
4066 4070
4067 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { 4071 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
4068 if (!delegate_) 4072 if (!delegate_)
4069 return; 4073 return;
4070 const gfx::Size new_size = GetPreferredSize(); 4074 const gfx::Size new_size = GetPreferredSize();
4071 if (new_size != old_size) 4075 if (new_size != old_size)
4072 delegate_->UpdatePreferredSize(this, new_size); 4076 delegate_->UpdatePreferredSize(this, new_size);
4073 } 4077 }
4074 4078
4075 } // namespace content 4079 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698