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

Side by Side Diff: chrome/browser/content_settings/permission_bubble_request_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_BUBBLE_REQUEST_IMPL_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "chrome/browser/ui/website_settings/permission_bubble_request.h" 9 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
10 #include "components/content_settings/core/common/content_settings_types.h" 10 #include "components/content_settings/core/common/content_settings_types.h"
(...skipping 16 matching lines...) Expand all
27 const GURL& request_origin, 27 const GURL& request_origin,
28 bool user_gesture, 28 bool user_gesture,
29 ContentSettingsType type, 29 ContentSettingsType type,
30 const std::string& display_languages, 30 const std::string& display_languages,
31 const PermissionDecidedCallback permission_decided_callback, 31 const PermissionDecidedCallback permission_decided_callback,
32 const base::Closure delete_callback); 32 const base::Closure delete_callback);
33 33
34 virtual ~PermissionBubbleRequestImpl(); 34 virtual ~PermissionBubbleRequestImpl();
35 35
36 // PermissionBubbleRequest: 36 // PermissionBubbleRequest:
37 virtual int GetIconID() const OVERRIDE; 37 virtual int GetIconID() const override;
38 virtual base::string16 GetMessageText() const OVERRIDE; 38 virtual base::string16 GetMessageText() const override;
39 virtual base::string16 GetMessageTextFragment() const OVERRIDE; 39 virtual base::string16 GetMessageTextFragment() const override;
40 virtual bool HasUserGesture() const OVERRIDE; 40 virtual bool HasUserGesture() const override;
41 41
42 // TODO(miguelg) Change this method to GetOrigin() 42 // TODO(miguelg) Change this method to GetOrigin()
43 virtual GURL GetRequestingHostname() const OVERRIDE; 43 virtual GURL GetRequestingHostname() const override;
44 44
45 // Remember to call RegisterActionTaken for these methods if you are 45 // Remember to call RegisterActionTaken for these methods if you are
46 // overriding them. 46 // overriding them.
47 virtual void PermissionGranted() OVERRIDE; 47 virtual void PermissionGranted() override;
48 virtual void PermissionDenied() OVERRIDE; 48 virtual void PermissionDenied() override;
49 virtual void Cancelled() OVERRIDE; 49 virtual void Cancelled() override;
50 virtual void RequestFinished() OVERRIDE; 50 virtual void RequestFinished() override;
51 51
52 protected: 52 protected:
53 void RegisterActionTaken() { action_taken_ = true; } 53 void RegisterActionTaken() { action_taken_ = true; }
54 54
55 private: 55 private:
56 GURL request_origin_; 56 GURL request_origin_;
57 bool user_gesture_; 57 bool user_gesture_;
58 ContentSettingsType type_; 58 ContentSettingsType type_;
59 std::string display_languages_; 59 std::string display_languages_;
60 60
61 // Called once a decision is made about the permission. 61 // Called once a decision is made about the permission.
62 const PermissionDecidedCallback permission_decided_callback_; 62 const PermissionDecidedCallback permission_decided_callback_;
63 63
64 // Called when the bubble is no longer in use so it can be deleted by 64 // Called when the bubble is no longer in use so it can be deleted by
65 // the caller. 65 // the caller.
66 const base::Closure delete_callback_; 66 const base::Closure delete_callback_;
67 bool is_finished_; 67 bool is_finished_;
68 bool action_taken_; 68 bool action_taken_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(PermissionBubbleRequestImpl); 70 DISALLOW_COPY_AND_ASSIGN(PermissionBubbleRequestImpl);
71 }; 71 };
72 72
73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_ 73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_BUBBLE_REQUEST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698