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

Unified Diff: chrome/browser/ui/webui/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
Index: chrome/browser/ui/webui/constrained_web_dialog_ui.cc
diff --git a/ui/web_dialogs/constrained_web_dialog_ui.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
similarity index 95%
rename from ui/web_dialogs/constrained_web_dialog_ui.cc
rename to chrome/browser/ui/webui/constrained_web_dialog_ui.cc
index b14b5cab7b846bdf10634a486797c8fc76356ac7..e9c39c8f2384fa8f318368bbcd825da5543dc2ba 100644
--- a/ui/web_dialogs/constrained_web_dialog_ui.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -2,7 +2,7 @@
// 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 "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
#include <string>
#include <vector>
@@ -22,8 +22,6 @@ using content::RenderViewHost;
using content::WebContents;
using content::WebUIMessageHandler;
-namespace ui {
-
namespace {
const char kConstrainedWebDialogDelegateUserDataKey[] =
@@ -59,7 +57,7 @@ void ConstrainedWebDialogUI::RenderViewCreated(
if (!delegate)
return;
- WebDialogDelegate* dialog_delegate = delegate->GetWebDialogDelegate();
+ ui::WebDialogDelegate* dialog_delegate = delegate->GetWebDialogDelegate();
std::vector<WebUIMessageHandler*> handlers;
dialog_delegate->GetWebUIMessageHandlers(&handlers);
render_view_host->SetWebUIProperty("dialogArguments",
@@ -105,5 +103,3 @@ ConstrainedWebDialogDelegate* ConstrainedWebDialogUI::GetConstrainedDelegate() {
return user_data ? user_data->delegate() : NULL;
}
-
-} // namespace ui
« no previous file with comments | « chrome/browser/ui/webui/constrained_web_dialog_ui.h ('k') | chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698