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

Side by Side Diff: Source/core/page/Page.cpp

Issue 1005223002: Blink: Replace all "plug-in" with "plugin". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Revert netscape-dom-access tests. 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
« no previous file with comments | « Source/core/layout/LayoutPart.cpp ('k') | Source/core/paint/PartPainter.cpp » ('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) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R ights Reserved.
3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 } 258 }
259 259
260 void Page::refreshPlugins() 260 void Page::refreshPlugins()
261 { 261 {
262 if (allPages().isEmpty()) 262 if (allPages().isEmpty())
263 return; 263 return;
264 264
265 PluginData::refresh(); 265 PluginData::refresh();
266 266
267 for (const Page* page : allPages()) { 267 for (const Page* page : allPages()) {
268 // Clear out the page's plug-in data. 268 // Clear out the page's plugin data.
269 if (page->m_pluginData) 269 if (page->m_pluginData)
270 page->m_pluginData = nullptr; 270 page->m_pluginData = nullptr;
271 } 271 }
272 } 272 }
273 273
274 PluginData* Page::pluginData() const 274 PluginData* Page::pluginData() const
275 { 275 {
276 if (!mainFrame()->isLocalFrame() 276 if (!mainFrame()->isLocalFrame()
277 || !deprecatedLocalMainFrame()->loader().allowPlugins(NotAboutToInstanti atePlugin)) 277 || !deprecatedLocalMainFrame()->loader().allowPlugins(NotAboutToInstanti atePlugin))
278 return nullptr; 278 return nullptr;
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 , dragClient(nullptr) 621 , dragClient(nullptr)
622 , spellCheckerClient(nullptr) 622 , spellCheckerClient(nullptr)
623 { 623 {
624 } 624 }
625 625
626 Page::PageClients::~PageClients() 626 Page::PageClients::~PageClients()
627 { 627 {
628 } 628 }
629 629
630 } // namespace blink 630 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutPart.cpp ('k') | Source/core/paint/PartPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698