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

Unified Diff: ui/web_dialogs/constrained_web_dialog_ui.cc

Issue 11358027: Move constrained web dialog code back to chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros fix2 Created 8 years, 1 month 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 | « ui/web_dialogs/constrained_web_dialog_ui.h ('k') | ui/web_dialogs/web_dialogs.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/web_dialogs/constrained_web_dialog_ui.cc
diff --git a/ui/web_dialogs/constrained_web_dialog_ui.cc b/ui/web_dialogs/constrained_web_dialog_ui.cc
deleted file mode 100644
index b14b5cab7b846bdf10634a486797c8fc76356ac7..0000000000000000000000000000000000000000
--- a/ui/web_dialogs/constrained_web_dialog_ui.cc
+++ /dev/null
@@ -1,109 +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 "ui/web_dialogs/constrained_web_dialog_ui.h"
-
-#include <string>
-#include <vector>
-
-#include "base/bind.h"
-#include "base/bind_helpers.h"
-#include "base/lazy_instance.h"
-#include "base/values.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_ui.h"
-#include "ui/web_dialogs/web_dialog_delegate.h"
-#include "ui/web_dialogs/web_dialog_ui.h"
-
-using content::RenderViewHost;
-using content::WebContents;
-using content::WebUIMessageHandler;
-
-namespace ui {
-
-namespace {
-
-const char kConstrainedWebDialogDelegateUserDataKey[] =
- "ConstrainedWebDialogDelegateUserData";
-
-class ConstrainedWebDialogDelegateUserData
- : public base::SupportsUserData::Data {
- public:
- explicit ConstrainedWebDialogDelegateUserData(
- ConstrainedWebDialogDelegate* delegate) : delegate_(delegate) {}
- virtual ~ConstrainedWebDialogDelegateUserData() {}
-
- ConstrainedWebDialogDelegate* delegate() { return delegate_; }
-
- private:
- ConstrainedWebDialogDelegate* delegate_; // unowned
-
- DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateUserData);
-};
-
-} // namespace
-
-ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui)
- : WebUIController(web_ui) {
-}
-
-ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
-}
-
-void ConstrainedWebDialogUI::RenderViewCreated(
- RenderViewHost* render_view_host) {
- ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate();
- if (!delegate)
- return;
-
- WebDialogDelegate* dialog_delegate = delegate->GetWebDialogDelegate();
- std::vector<WebUIMessageHandler*> handlers;
- dialog_delegate->GetWebUIMessageHandlers(&handlers);
- render_view_host->SetWebUIProperty("dialogArguments",
- dialog_delegate->GetDialogArgs());
- for (std::vector<WebUIMessageHandler*>::iterator it = handlers.begin();
- it != handlers.end(); ++it) {
- web_ui()->AddMessageHandler(*it);
- }
-
- // Add a "DialogClose" callback which matches WebDialogUI behavior.
- web_ui()->RegisterMessageCallback("DialogClose",
- base::Bind(&ConstrainedWebDialogUI::OnDialogCloseMessage,
- base::Unretained(this)));
-
- dialog_delegate->OnDialogShown(web_ui(), render_view_host);
-}
-
-void ConstrainedWebDialogUI::OnDialogCloseMessage(const ListValue* args) {
- ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate();
- if (!delegate)
- return;
-
- std::string json_retval;
- if (!args->empty() && !args->GetString(0, &json_retval))
- NOTREACHED() << "Could not read JSON argument";
- delegate->GetWebDialogDelegate()->OnDialogClosed(json_retval);
- delegate->OnDialogCloseFromWebUI();
-}
-
-// static
-void ConstrainedWebDialogUI::SetConstrainedDelegate(
- content::WebContents* web_contents,
- ConstrainedWebDialogDelegate* delegate) {
- web_contents->SetUserData(&kConstrainedWebDialogDelegateUserDataKey,
- new ConstrainedWebDialogDelegateUserData(delegate));
-}
-
-ConstrainedWebDialogDelegate* ConstrainedWebDialogUI::GetConstrainedDelegate() {
- ConstrainedWebDialogDelegateUserData* user_data =
- static_cast<ConstrainedWebDialogDelegateUserData*>(
- web_ui()->GetWebContents()->
- GetUserData(&kConstrainedWebDialogDelegateUserDataKey));
-
- return user_data ? user_data->delegate() : NULL;
-}
-
-} // namespace ui
« no previous file with comments | « ui/web_dialogs/constrained_web_dialog_ui.h ('k') | ui/web_dialogs/web_dialogs.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698