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

Side by Side Diff: chrome/browser/pepper_flash_settings_manager.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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
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 "chrome/browser/pepper_flash_settings_manager.h" 5 #include "chrome/browser/pepper_flash_settings_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 void SetSitePermission(uint32 request_id, 57 void SetSitePermission(uint32 request_id,
58 PP_Flash_BrowserOperations_SettingType setting_type, 58 PP_Flash_BrowserOperations_SettingType setting_type,
59 const ppapi::FlashSiteSettings& sites); 59 const ppapi::FlashSiteSettings& sites);
60 void GetSitesWithData(uint32 request_id); 60 void GetSitesWithData(uint32 request_id);
61 void ClearSiteData(uint32 request_id, 61 void ClearSiteData(uint32 request_id,
62 const std::string& site, 62 const std::string& site,
63 uint64 flags, 63 uint64 flags,
64 uint64 max_age); 64 uint64 max_age);
65 65
66 // IPC::Listener implementation. 66 // IPC::Listener implementation.
67 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 67 virtual bool OnMessageReceived(const IPC::Message& message) override;
68 virtual void OnChannelError() OVERRIDE; 68 virtual void OnChannelError() override;
69 69
70 private: 70 private:
71 friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; 71 friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
72 friend class base::DeleteHelper<Core>; 72 friend class base::DeleteHelper<Core>;
73 73
74 enum RequestType { 74 enum RequestType {
75 INVALID_REQUEST_TYPE = 0, 75 INVALID_REQUEST_TYPE = 0,
76 DEAUTHORIZE_CONTENT_LICENSES, 76 DEAUTHORIZE_CONTENT_LICENSES,
77 GET_PERMISSION_SETTINGS, 77 GET_PERMISSION_SETTINGS,
78 SET_DEFAULT_PERMISSION, 78 SET_DEFAULT_PERMISSION,
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 } 1062 }
1063 1063
1064 void PepperFlashSettingsManager::OnError(Core* core) { 1064 void PepperFlashSettingsManager::OnError(Core* core) {
1065 DCHECK(core); 1065 DCHECK(core);
1066 if (core != core_.get()) 1066 if (core != core_.get())
1067 return; 1067 return;
1068 1068
1069 core_->Detach(); 1069 core_->Detach();
1070 core_ = NULL; 1070 core_ = NULL;
1071 } 1071 }
OLDNEW
« no previous file with comments | « chrome/browser/pepper_broker_infobar_delegate.h ('k') | chrome/browser/plugins/chrome_plugin_service_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698