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

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: #include <map> 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1652 MEDIA_DEVICE_INVALID_STATE, 1652 MEDIA_DEVICE_INVALID_STATE,
1653 scoped_ptr<MediaStreamUI>()); 1653 scoped_ptr<MediaStreamUI>());
1654 } 1654 }
1655 } 1655 }
1656 1656
1657 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( 1657 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace(
1658 SiteInstance* instance) { 1658 SiteInstance* instance) {
1659 return controller_.GetSessionStorageNamespace(instance); 1659 return controller_.GetSessionStorageNamespace(instance);
1660 } 1660 }
1661 1661
1662 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() {
1663 return controller_.GetSessionStorageNamespaceMap();
1664 }
1665
1662 FrameTree* WebContentsImpl::GetFrameTree() { 1666 FrameTree* WebContentsImpl::GetFrameTree() {
1663 return &frame_tree_; 1667 return &frame_tree_;
1664 } 1668 }
1665 1669
1666 void WebContentsImpl::AccessibilityEventReceived( 1670 void WebContentsImpl::AccessibilityEventReceived(
1667 const std::vector<AXEventNotificationDetails>& details) { 1671 const std::vector<AXEventNotificationDetails>& details) {
1668 FOR_EACH_OBSERVER( 1672 FOR_EACH_OBSERVER(
1669 WebContentsObserver, observers_, AccessibilityEventReceived(details)); 1673 WebContentsObserver, observers_, AccessibilityEventReceived(details));
1670 } 1674 }
1671 1675
(...skipping 2374 matching lines...) Expand 10 before | Expand all | Expand 10 after
4046 4050
4047 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { 4051 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
4048 if (!delegate_) 4052 if (!delegate_)
4049 return; 4053 return;
4050 const gfx::Size new_size = GetPreferredSize(); 4054 const gfx::Size new_size = GetPreferredSize();
4051 if (new_size != old_size) 4055 if (new_size != old_size)
4052 delegate_->UpdatePreferredSize(this, new_size); 4056 delegate_->UpdatePreferredSize(this, new_size);
4053 } 4057 }
4054 4058
4055 } // namespace content 4059 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698