OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_tabs_module.h" | 5 #include "chrome/browser/extensions/extension_tabs_module.h" |
6 | 6 |
7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 // Get the serialized dict from the last focused control and return it. | 202 // Get the serialized dict from the last focused control and return it. |
203 // However, if the dict is empty, that means we haven't seen any focus | 203 // However, if the dict is empty, that means we haven't seen any focus |
204 // events yet, so return null instead. | 204 // events yet, so return null instead. |
205 ExtensionAccessibilityEventRouter *accessibility_event_router = | 205 ExtensionAccessibilityEventRouter *accessibility_event_router = |
206 ExtensionAccessibilityEventRouter::GetInstance(); | 206 ExtensionAccessibilityEventRouter::GetInstance(); |
207 DictionaryValue *last_focused_control_dict = | 207 DictionaryValue *last_focused_control_dict = |
208 accessibility_event_router->last_focused_control_dict(); | 208 accessibility_event_router->last_focused_control_dict(); |
209 if (last_focused_control_dict->size()) { | 209 if (last_focused_control_dict->size()) { |
210 result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren()); | 210 result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren()); |
211 } else { | 211 } else { |
212 result_.reset(Value::CreateNullValue()); | 212 result_.reset(base::NullValue()); |
213 } | 213 } |
214 return true; | 214 return true; |
215 } | 215 } |
OLD | NEW |