chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc - Issue 12298037: Revert 183123

Side by Side Diff: chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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

OLD	NEW
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/ui/app_modal_dialogs/javascript_dialog_manager.h"	5 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"

6	6

7 #include <map>	7 #include <map>

8	8

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/i18n/rtl.h"	10 #include "base/i18n/rtl.h"

11 #include "base/memory/singleton.h"	11 #include "base/memory/singleton.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/utf_string_conversions.h"

13 #include "chrome/browser/extensions/extension_host.h"	13 #include "chrome/browser/extensions/extension_host.h"

14 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"	15 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"

17 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"	16 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"

18 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"	17 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"

19 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"	18 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"

20 #include "chrome/common/chrome_constants.h"	19 #include "chrome/common/chrome_constants.h"

21 #include "chrome/common/chrome_notification_types.h"	20 #include "chrome/common/chrome_notification_types.h"

22 #include "content/public/browser/notification_observer.h"	21 #include "content/public/browser/notification_observer.h"

23 #include "content/public/browser/notification_registrar.h"	22 #include "content/public/browser/notification_registrar.h"

24 #include "content/public/browser/notification_service.h"	23 #include "content/public/browser/notification_service.h"

25 #include "content/public/common/content_client.h"	24 #include "content/public/common/content_client.h"

(...skipping 266 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
292 } // namespace	291 } // namespace

293	292

294 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {	293 content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {

295 return ChromeJavaScriptDialogManager::GetInstance();	294 return ChromeJavaScriptDialogManager::GetInstance();

296 }	295 }

297	296

298 content::JavaScriptDialogManager* CreateJavaScriptDialogManagerInstance(	297 content::JavaScriptDialogManager* CreateJavaScriptDialogManagerInstance(

299 extensions::ExtensionHost* extension_host) {	298 extensions::ExtensionHost* extension_host) {

300 return new ChromeJavaScriptDialogManager(extension_host);	299 return new ChromeJavaScriptDialogManager(extension_host);

301 }	300 }

OLD	NEW