| OLD | NEW |
| 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 #include "extensions/browser/api/system_display/system_display_api.h" | 5 #include "extensions/browser/api/system_display/system_display_api.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 135 |
| 136 OverscanTracker::OverscanWebObserver* OverscanTracker::GetObserver( | 136 OverscanTracker::OverscanWebObserver* OverscanTracker::GetObserver( |
| 137 content::WebContents* web_contents, | 137 content::WebContents* web_contents, |
| 138 bool create) { | 138 bool create) { |
| 139 ObserverMap::iterator iter = observers_.find(web_contents); | 139 ObserverMap::iterator iter = observers_.find(web_contents); |
| 140 if (iter != observers_.end()) | 140 if (iter != observers_.end()) |
| 141 return iter->second.get(); | 141 return iter->second.get(); |
| 142 if (!create) | 142 if (!create) |
| 143 return nullptr; | 143 return nullptr; |
| 144 auto owned_observer = base::MakeUnique<OverscanWebObserver>(web_contents); | 144 auto owned_observer = base::MakeUnique<OverscanWebObserver>(web_contents); |
| 145 auto observer_ptr = owned_observer.get(); | 145 auto* observer_ptr = owned_observer.get(); |
| 146 observers_[web_contents] = std::move(owned_observer); | 146 observers_[web_contents] = std::move(owned_observer); |
| 147 return observer_ptr; | 147 return observer_ptr; |
| 148 } | 148 } |
| 149 | 149 |
| 150 bool OverscanTracker::RemoveObserverImpl(content::WebContents* web_contents) { | 150 bool OverscanTracker::RemoveObserverImpl(content::WebContents* web_contents) { |
| 151 observers_.erase(web_contents); | 151 observers_.erase(web_contents); |
| 152 return observers_.empty(); | 152 return observers_.empty(); |
| 153 } | 153 } |
| 154 | 154 |
| 155 } // namespace | 155 } // namespace |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 std::string error; | 336 std::string error; |
| 337 if (DisplayInfoProvider::Get()->IsNativeTouchCalibrationActive(&error)) | 337 if (DisplayInfoProvider::Get()->IsNativeTouchCalibrationActive(&error)) |
| 338 return RespondNow(Error(error)); | 338 return RespondNow(Error(error)); |
| 339 | 339 |
| 340 if (!DisplayInfoProvider::Get()->ClearTouchCalibration(params->id, &error)) | 340 if (!DisplayInfoProvider::Get()->ClearTouchCalibration(params->id, &error)) |
| 341 return RespondNow(Error(error)); | 341 return RespondNow(Error(error)); |
| 342 return RespondNow(NoArguments()); | 342 return RespondNow(NoArguments()); |
| 343 } | 343 } |
| 344 | 344 |
| 345 } // namespace extensions | 345 } // namespace extensions |
| OLD | NEW |