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

Unified Diff: content/shell/shell_javascript_dialog_manager.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/shell_javascript_dialog_manager.h ('k') | content/shell/shell_javascript_dialog_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_javascript_dialog_manager.cc
diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/shell_javascript_dialog_manager.cc
deleted file mode 100644
index 92484839cf699c0b30183cac6b9295347abea616..0000000000000000000000000000000000000000
--- a/content/shell/shell_javascript_dialog_manager.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/shell/shell_javascript_dialog_manager.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
-#include "content/shell/common/shell_switches.h"
-#include "content/shell/shell_javascript_dialog.h"
-#include "content/shell/webkit_test_controller.h"
-#include "net/base/net_util.h"
-
-namespace content {
-
-ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {
-}
-
-ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
-}
-
-void ShellJavaScriptDialogManager::RunJavaScriptDialog(
- WebContents* web_contents,
- const GURL& origin_url,
- const std::string& accept_lang,
- JavaScriptMessageType javascript_message_type,
- const string16& message_text,
- const string16& default_prompt_text,
- const DialogClosedCallback& callback,
- bool* did_suppress_message) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
- callback.Run(true, string16());
- return;
- }
-
- if (!dialog_request_callback_.is_null()) {
- dialog_request_callback_.Run();
- callback.Run(true, string16());
- dialog_request_callback_.Reset();
- return;
- }
-
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
- *did_suppress_message = false;
-
- if (dialog_) {
- // One dialog at a time, please.
- *did_suppress_message = true;
- return;
- }
-
- string16 new_message_text = net::FormatUrl(origin_url, accept_lang) +
- ASCIIToUTF16("\n\n") +
- message_text;
- gfx::NativeWindow parent_window =
- web_contents->GetView()->GetTopLevelNativeWindow();
-
- dialog_.reset(new ShellJavaScriptDialog(this,
- parent_window,
- javascript_message_type,
- new_message_text,
- default_prompt_text,
- callback));
-#else
- // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
- *did_suppress_message = true;
- return;
-#endif
-}
-
-void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
- WebContents* web_contents,
- const string16& message_text,
- bool is_reload,
- const DialogClosedCallback& callback) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
- callback.Run(true, string16());
- return;
- }
-
- if (!dialog_request_callback_.is_null()) {
- dialog_request_callback_.Run();
- callback.Run(true, string16());
- dialog_request_callback_.Reset();
- return;
- }
-
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
- if (dialog_) {
- // Seriously!?
- callback.Run(true, string16());
- return;
- }
-
- string16 new_message_text =
- message_text +
- ASCIIToUTF16("\n\nIs it OK to leave/reload this page?");
-
- gfx::NativeWindow parent_window =
- web_contents->GetView()->GetTopLevelNativeWindow();
-
- dialog_.reset(new ShellJavaScriptDialog(this,
- parent_window,
- JAVASCRIPT_MESSAGE_TYPE_CONFIRM,
- new_message_text,
- string16(), // default_prompt_text
- callback));
-#else
- // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
- callback.Run(true, string16());
- return;
-#endif
-}
-
-void ShellJavaScriptDialogManager::CancelActiveAndPendingDialogs(
- WebContents* web_contents) {
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
- if (dialog_) {
- dialog_->Cancel();
- dialog_.reset();
- }
-#else
- // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
-#endif
-}
-
-void ShellJavaScriptDialogManager::WebContentsDestroyed(
- WebContents* web_contents) {
-}
-
-void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
- DCHECK_EQ(dialog, dialog_.get());
- dialog_.reset();
-#else
- // TODO: implement ShellJavaScriptDialog for other platforms, drop this #if
-#endif
-}
-
-} // namespace content
« no previous file with comments | « content/shell/shell_javascript_dialog_manager.h ('k') | content/shell/shell_javascript_dialog_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698