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

Side by Side Diff: chrome/browser/accessibility/accessibility_extension_api.cc

Issue 228293004: InfoBarService inherits from InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: whitespace Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/accessibility/accessibility_extension_api.h" 5 #include "chrome/browser/accessibility/accessibility_extension_api.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h" 10 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
11 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 11 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_tab_util.h" 13 #include "chrome/browser/extensions/extension_tab_util.h"
14 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 14 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
15 #include "chrome/browser/infobars/infobar.h" 15 #include "chrome/browser/infobars/infobar.h"
16 #include "chrome/browser/infobars/infobar_manager.h"
17 #include "chrome/browser/infobars/infobar_service.h" 16 #include "chrome/browser/infobars/infobar_service.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/common/extensions/api/accessibility_private.h" 18 #include "chrome/common/extensions/api/accessibility_private.h"
20 #include "content/public/browser/browser_accessibility_state.h" 19 #include "content/public/browser/browser_accessibility_state.h"
21 #include "extensions/browser/event_router.h" 20 #include "extensions/browser/event_router.h"
22 #include "extensions/browser/extension_host.h" 21 #include "extensions/browser/extension_host.h"
23 #include "extensions/browser/extension_system.h" 22 #include "extensions/browser/extension_system.h"
24 #include "extensions/browser/lazy_background_task_queue.h" 23 #include "extensions/browser/lazy_background_task_queue.h"
25 #include "extensions/common/error_utils.h" 24 #include "extensions/common/error_utils.h"
26 #include "extensions/common/manifest_handlers/background_info.h" 25 #include "extensions/common/manifest_handlers/background_info.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 &contents, 267 &contents,
269 &tab_index)) { 268 &tab_index)) {
270 error_ = extensions::ErrorUtils::FormatErrorMessage( 269 error_ = extensions::ErrorUtils::FormatErrorMessage(
271 extensions::tabs_constants::kTabNotFoundError, 270 extensions::tabs_constants::kTabNotFoundError,
272 base::IntToString(tab_id)); 271 base::IntToString(tab_id));
273 return false; 272 return false;
274 } 273 }
275 274
276 base::ListValue* alerts_value = new base::ListValue; 275 base::ListValue* alerts_value = new base::ListValue;
277 276
278 InfoBarManager* infobar_manager = 277 InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
279 InfoBarService::FromWebContents(contents)->infobar_manager(); 278 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
280 for (size_t i = 0; i < infobar_manager->infobar_count(); ++i) {
281 // TODO(hashimoto): Make other kind of alerts available. crosbug.com/24281 279 // TODO(hashimoto): Make other kind of alerts available. crosbug.com/24281
282 ConfirmInfoBarDelegate* confirm_infobar_delegate = 280 ConfirmInfoBarDelegate* confirm_infobar_delegate =
283 infobar_manager->infobar_at(i)->delegate()->AsConfirmInfoBarDelegate(); 281 infobar_service->infobar_at(i)->delegate()->AsConfirmInfoBarDelegate();
284 if (confirm_infobar_delegate) { 282 if (confirm_infobar_delegate) {
285 base::DictionaryValue* alert_value = new base::DictionaryValue; 283 base::DictionaryValue* alert_value = new base::DictionaryValue;
286 const base::string16 message_text = 284 const base::string16 message_text =
287 confirm_infobar_delegate->GetMessageText(); 285 confirm_infobar_delegate->GetMessageText();
288 alert_value->SetString(keys::kMessageKey, message_text); 286 alert_value->SetString(keys::kMessageKey, message_text);
289 alerts_value->Append(alert_value); 287 alerts_value->Append(alert_value);
290 } 288 }
291 } 289 }
292 290
293 SetResult(alerts_value); 291 SetResult(alerts_value);
294 return true; 292 return true;
295 } 293 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/tab_android.cc » ('j') | chrome/browser/autofill/autofill_interactive_uitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698