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

Side by Side Diff: Source/modules/plugins/DOMMimeType.cpp

Issue 1026253002: Rename FrameDestructionObserver to LocalFrameLifecycleObserver. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 5 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
« no previous file with comments | « Source/modules/plugins/DOMMimeType.h ('k') | Source/modules/plugins/DOMPlugin.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 /* 1 /*
2 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 2 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 10 matching lines...) Expand all
21 21
22 #include "core/frame/LocalFrame.h" 22 #include "core/frame/LocalFrame.h"
23 #include "core/loader/FrameLoader.h" 23 #include "core/loader/FrameLoader.h"
24 #include "core/page/Page.h" 24 #include "core/page/Page.h"
25 #include "modules/plugins/DOMPlugin.h" 25 #include "modules/plugins/DOMPlugin.h"
26 #include "wtf/text/StringBuilder.h" 26 #include "wtf/text/StringBuilder.h"
27 27
28 namespace blink { 28 namespace blink {
29 29
30 DOMMimeType::DOMMimeType(PassRefPtr<PluginData> pluginData, LocalFrame* frame, u nsigned index) 30 DOMMimeType::DOMMimeType(PassRefPtr<PluginData> pluginData, LocalFrame* frame, u nsigned index)
31 : FrameDestructionObserver(frame) 31 : LocalFrameLifecycleObserver(frame)
32 , m_pluginData(pluginData) 32 , m_pluginData(pluginData)
33 , m_index(index) 33 , m_index(index)
34 { 34 {
35 } 35 }
36 36
37 DOMMimeType::~DOMMimeType() 37 DOMMimeType::~DOMMimeType()
38 { 38 {
39 } 39 }
40 40
41 DEFINE_TRACE(DOMMimeType) 41 DEFINE_TRACE(DOMMimeType)
42 { 42 {
43 FrameDestructionObserver::trace(visitor); 43 LocalFrameLifecycleObserver::trace(visitor);
44 } 44 }
45 45
46 const String &DOMMimeType::type() const 46 const String &DOMMimeType::type() const
47 { 47 {
48 return mimeClassInfo().type; 48 return mimeClassInfo().type;
49 } 49 }
50 50
51 String DOMMimeType::suffixes() const 51 String DOMMimeType::suffixes() const
52 { 52 {
53 const Vector<String>& extensions = mimeClassInfo().extensions; 53 const Vector<String>& extensions = mimeClassInfo().extensions;
(...skipping 17 matching lines...) Expand all
71 // FIXME: allowPlugins is just a client call. We should not need 71 // FIXME: allowPlugins is just a client call. We should not need
72 // to bounce through the loader to get there. 72 // to bounce through the loader to get there.
73 // Something like: frame()->host()->client()->allowPlugins(). 73 // Something like: frame()->host()->client()->allowPlugins().
74 if (!frame() || !frame()->loader().allowPlugins(NotAboutToInstantiatePlugin) ) 74 if (!frame() || !frame()->loader().allowPlugins(NotAboutToInstantiatePlugin) )
75 return nullptr; 75 return nullptr;
76 76
77 return DOMPlugin::create(m_pluginData.get(), frame(), m_pluginData->mimePlug inIndices()[m_index]); 77 return DOMPlugin::create(m_pluginData.get(), frame(), m_pluginData->mimePlug inIndices()[m_index]);
78 } 78 }
79 79
80 } // namespace blink 80 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/plugins/DOMMimeType.h ('k') | Source/modules/plugins/DOMPlugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698