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

Side by Side Diff: chrome/browser/content_settings/permission_queue_controller.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "components/content_settings/core/common/content_settings_types.h" 9 #include "components/content_settings/core/common/content_settings_types.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 // Performs the update to content settings for a particular request frame 52 // Performs the update to content settings for a particular request frame
53 // context. 53 // context.
54 void UpdateContentSetting( 54 void UpdateContentSetting(
55 const GURL& requesting_frame, const GURL& embedder, bool allowed); 55 const GURL& requesting_frame, const GURL& embedder, bool allowed);
56 56
57 protected: 57 protected:
58 // content::NotificationObserver: 58 // content::NotificationObserver:
59 virtual void Observe(int type, 59 virtual void Observe(int type,
60 const content::NotificationSource& source, 60 const content::NotificationSource& source,
61 const content::NotificationDetails& details) OVERRIDE; 61 const content::NotificationDetails& details) override;
62 62
63 private: 63 private:
64 class PendingInfobarRequest; 64 class PendingInfobarRequest;
65 class RequestEquals; 65 class RequestEquals;
66 66
67 typedef std::vector<PendingInfobarRequest> PendingInfobarRequests; 67 typedef std::vector<PendingInfobarRequest> PendingInfobarRequests;
68 68
69 // Returns true if a geolocation infobar is already visible for the tab 69 // Returns true if a geolocation infobar is already visible for the tab
70 // corresponding to |id|. 70 // corresponding to |id|.
71 bool AlreadyShowingInfoBarForTab(const PermissionRequestID& id) const; 71 bool AlreadyShowingInfoBarForTab(const PermissionRequestID& id) const;
(...skipping 14 matching lines...) Expand all
86 86
87 Profile* const profile_; 87 Profile* const profile_;
88 ContentSettingsType type_; 88 ContentSettingsType type_;
89 PendingInfobarRequests pending_infobar_requests_; 89 PendingInfobarRequests pending_infobar_requests_;
90 bool in_shutdown_; 90 bool in_shutdown_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(PermissionQueueController); 92 DISALLOW_COPY_AND_ASSIGN(PermissionQueueController);
93 }; 93 };
94 94
95 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ 95 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698