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

Side by Side Diff: chrome/browser/chromeos/power/peripheral_battery_observer.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 5 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/strings/grit/ash_strings.h" 10 #include "ash/strings/grit/ash_strings.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 std::string address = JoinString(result, ':'); 67 std::string address = JoinString(result, ':');
68 return address; 68 return address;
69 } 69 }
70 70
71 class PeripheralBatteryNotificationDelegate : public NotificationDelegate { 71 class PeripheralBatteryNotificationDelegate : public NotificationDelegate {
72 public: 72 public:
73 explicit PeripheralBatteryNotificationDelegate(const std::string& id) 73 explicit PeripheralBatteryNotificationDelegate(const std::string& id)
74 : id_(id) {} 74 : id_(id) {}
75 75
76 // Overridden from NotificationDelegate: 76 // Overridden from NotificationDelegate:
77 virtual void Display() OVERRIDE {} 77 virtual void Display() override {}
78 virtual void Error() OVERRIDE {} 78 virtual void Error() override {}
79 virtual void Close(bool by_user) OVERRIDE {} 79 virtual void Close(bool by_user) override {}
80 virtual void Click() OVERRIDE {} 80 virtual void Click() override {}
81 virtual std::string id() const OVERRIDE { return id_; } 81 virtual std::string id() const override { return id_; }
82 // A NULL return value prevents loading image from URL. It is OK since our 82 // A NULL return value prevents loading image from URL. It is OK since our
83 // implementation loads image from system resource bundle. 83 // implementation loads image from system resource bundle.
84 virtual content::WebContents* GetWebContents() const OVERRIDE { 84 virtual content::WebContents* GetWebContents() const override {
85 return NULL; 85 return NULL;
86 } 86 }
87 87
88 private: 88 private:
89 virtual ~PeripheralBatteryNotificationDelegate() {} 89 virtual ~PeripheralBatteryNotificationDelegate() {}
90 90
91 const std::string id_; 91 const std::string id_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(PeripheralBatteryNotificationDelegate); 93 DISALLOW_COPY_AND_ASSIGN(PeripheralBatteryNotificationDelegate);
94 }; 94 };
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 ProfileManager::GetPrimaryUserProfile()); 236 ProfileManager::GetPrimaryUserProfile());
237 237
238 return true; 238 return true;
239 } 239 }
240 240
241 void PeripheralBatteryObserver::CancelNotification(const std::string& address) { 241 void PeripheralBatteryObserver::CancelNotification(const std::string& address) {
242 g_browser_process->notification_ui_manager()->CancelById(address); 242 g_browser_process->notification_ui_manager()->CancelById(address);
243 } 243 }
244 244
245 } // namespace chromeos 245 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698