summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 20:33:15 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 20:33:15 +0000
commit32f497b982637006871eb3e32313a079909c7757 (patch)
tree929fcad93d5325b82436ef2b3b112568d8ba0734 /content
parent67ca7a055c7b948a31bd0dc06e249f4b17a39f1c (diff)
downloadchromium_src-32f497b982637006871eb3e32313a079909c7757.zip
chromium_src-32f497b982637006871eb3e32313a079909c7757.tar.gz
chromium_src-32f497b982637006871eb3e32313a079909c7757.tar.bz2
Move js_modal_dialogs.h to content\public\browser.
BUG=98716 TBR=joi Review URL: https://chromiumcodereview.appspot.com/9159038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc2
-rw-r--r--content/content_browser.gypi2
-rw-r--r--content/public/browser/javascript_dialogs.h (renamed from content/browser/javascript_dialogs.h)7
-rw-r--r--content/public/browser/web_contents_delegate.cc1
4 files changed, 5 insertions, 7 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 1f83d53..3d952f9 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -20,7 +20,6 @@
#include "content/browser/host_zoom_map_impl.h"
#include "content/browser/in_process_webkit/session_storage_namespace.h"
#include "content/browser/intents/web_intents_dispatcher_impl.h"
-#include "content/browser/javascript_dialogs.h"
#include "content/browser/load_from_memory_cache_details.h"
#include "content/browser/load_notification_details.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
@@ -41,6 +40,7 @@
#include "content/public/browser/devtools_agent_host_registry.h"
#include "content/public/browser/download_manager.h"
#include "content/public/browser/invalidate_type.h"
+#include "content/public/browser/javascript_dialogs.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/user_metrics.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 975b4fe..834506c 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -63,6 +63,7 @@
'public/browser/global_request_id.h',
'public/browser/host_zoom_map.h',
'public/browser/invalidate_type.h',
+ 'public/browser/javascript_dialogs.h',
'public/browser/native_web_keyboard_event.h',
'public/browser/navigation_controller.h',
'public/browser/navigation_details.cc',
@@ -355,7 +356,6 @@
'browser/intents/intent_injector.h',
'browser/intents/web_intents_dispatcher_impl.cc',
'browser/intents/web_intents_dispatcher_impl.h',
- 'browser/javascript_dialogs.h',
'browser/load_from_memory_cache_details.cc',
'browser/load_from_memory_cache_details.h',
'browser/load_notification_details.h',
diff --git a/content/browser/javascript_dialogs.h b/content/public/browser/javascript_dialogs.h
index 74b02d9..d1f005d 100644
--- a/content/browser/javascript_dialogs.h
+++ b/content/public/browser/javascript_dialogs.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_JAVASCRIPT_DIALOGS_H_
-#define CONTENT_BROWSER_JAVASCRIPT_DIALOGS_H_
+#ifndef CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
+#define CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
#pragma once
#include "base/callback.h"
@@ -20,7 +20,6 @@ class WebContents;
// dialogs.
class JavaScriptDialogCreator {
public:
-
typedef base::Callback<void(bool /* success */,
const string16& /* user_input */)>
DialogClosedCallback;
@@ -58,4 +57,4 @@ class JavaScriptDialogCreator {
} // namespace content
-#endif // CONTENT_BROWSER_JAVASCRIPT_DIALOGS_H_
+#endif // CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index c2f0023..e429789 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -7,7 +7,6 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
-#include "content/browser/javascript_dialogs.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_intents_dispatcher.h"
#include "content/public/common/url_constants.h"