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

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: rebase 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 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 MEDIA_DEVICE_INVALID_STATE, 1653 MEDIA_DEVICE_INVALID_STATE,
1654 scoped_ptr<MediaStreamUI>()); 1654 scoped_ptr<MediaStreamUI>());
1655 } 1655 }
1656 } 1656 }
1657 1657
1658 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( 1658 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace(
1659 SiteInstance* instance) { 1659 SiteInstance* instance) {
1660 return controller_.GetSessionStorageNamespace(instance); 1660 return controller_.GetSessionStorageNamespace(instance);
1661 } 1661 }
1662 1662
1663 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() {
1664 return controller_.GetSessionStorageNamespaceMap();
1665 }
1666
1663 FrameTree* WebContentsImpl::GetFrameTree() { 1667 FrameTree* WebContentsImpl::GetFrameTree() {
1664 return &frame_tree_; 1668 return &frame_tree_;
1665 } 1669 }
1666 1670
1667 void WebContentsImpl::AccessibilityEventReceived( 1671 void WebContentsImpl::AccessibilityEventReceived(
1668 const std::vector<AXEventNotificationDetails>& details) { 1672 const std::vector<AXEventNotificationDetails>& details) {
1669 FOR_EACH_OBSERVER( 1673 FOR_EACH_OBSERVER(
1670 WebContentsObserver, observers_, AccessibilityEventReceived(details)); 1674 WebContentsObserver, observers_, AccessibilityEventReceived(details));
1671 } 1675 }
1672 1676
(...skipping 2374 matching lines...) Expand 10 before | Expand all | Expand 10 after
4047 4051
4048 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { 4052 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
4049 if (!delegate_) 4053 if (!delegate_)
4050 return; 4054 return;
4051 const gfx::Size new_size = GetPreferredSize(); 4055 const gfx::Size new_size = GetPreferredSize();
4052 if (new_size != old_size) 4056 if (new_size != old_size)
4053 delegate_->UpdatePreferredSize(this, new_size); 4057 delegate_->UpdatePreferredSize(this, new_size);
4054 } 4058 }
4055 4059
4056 } // namespace content 4060 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698