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

Side by Side Diff: Source/core/testing/MockPagePopupDriver.cpp

Issue 636913002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/testing/MockPagePopupDriver.h ('k') | Source/core/testing/NullExecutionContext.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class MockPagePopup : public PagePopup, public RefCounted<MockPagePopup> { 42 class MockPagePopup : public PagePopup, public RefCounted<MockPagePopup> {
43 public: 43 public:
44 static PassRefPtr<MockPagePopup> create(PagePopupClient*, const IntRect& ori ginBoundsInRootView, LocalFrame*); 44 static PassRefPtr<MockPagePopup> create(PagePopupClient*, const IntRect& ori ginBoundsInRootView, LocalFrame*);
45 virtual ~MockPagePopup(); 45 virtual ~MockPagePopup();
46 bool initialize(); 46 bool initialize();
47 void closeLater(); 47 void closeLater();
48 48
49 private: 49 private:
50 MockPagePopup(PagePopupClient*, const IntRect& originBoundsInRootView, Local Frame*); 50 MockPagePopup(PagePopupClient*, const IntRect& originBoundsInRootView, Local Frame*);
51 void close(Timer<MockPagePopup>*); 51 void close(Timer<MockPagePopup>*);
52 virtual AXObject* rootAXObject() OVERRIDE { return 0; } 52 virtual AXObject* rootAXObject() override { return 0; }
53 53
54 PagePopupClient* m_popupClient; 54 PagePopupClient* m_popupClient;
55 RefPtrWillBePersistent<HTMLIFrameElement> m_iframe; 55 RefPtrWillBePersistent<HTMLIFrameElement> m_iframe;
56 Timer<MockPagePopup> m_closeTimer; 56 Timer<MockPagePopup> m_closeTimer;
57 }; 57 };
58 58
59 inline MockPagePopup::MockPagePopup(PagePopupClient* client, const IntRect& orig inBoundsInRootView, LocalFrame* mainFrame) 59 inline MockPagePopup::MockPagePopup(PagePopupClient* client, const IntRect& orig inBoundsInRootView, LocalFrame* mainFrame)
60 : m_popupClient(client) 60 : m_popupClient(client)
61 , m_closeTimer(this, &MockPagePopup::close) 61 , m_closeTimer(this, &MockPagePopup::close)
62 { 62 {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 { 144 {
145 if (!popup || popup != m_mockPagePopup.get()) 145 if (!popup || popup != m_mockPagePopup.get())
146 return; 146 return;
147 m_mockPagePopup->closeLater(); 147 m_mockPagePopup->closeLater();
148 m_mockPagePopup.clear(); 148 m_mockPagePopup.clear();
149 m_pagePopupController->clearPagePopupClient(); 149 m_pagePopupController->clearPagePopupClient();
150 m_pagePopupController.clear(); 150 m_pagePopupController.clear();
151 } 151 }
152 152
153 } 153 }
OLDNEW
« no previous file with comments | « Source/core/testing/MockPagePopupDriver.h ('k') | Source/core/testing/NullExecutionContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698