From dd3db6a1bb9b162e4f55e9c16b2890a4b60bef03 Mon Sep 17 00:00:00 2001
From: oshima <oshima@chromium.org>
Date: Mon, 10 Nov 2014 14:21:23 -0800
Subject: Add namespace to constrained_window component
BUG=None
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/705303002
Cr-Commit-Position: refs/heads/master@{#303523}
---
athena/extensions/athena_constrained_window_views_client.cc | 6 +++---
athena/extensions/athena_javascript_native_dialog_factory.cc | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'athena')
diff --git a/athena/extensions/athena_constrained_window_views_client.cc b/athena/extensions/athena_constrained_window_views_client.cc
index db818f6..d56503f 100644
--- a/athena/extensions/athena_constrained_window_views_client.cc
+++ b/athena/extensions/athena_constrained_window_views_client.cc
@@ -100,7 +100,7 @@ web_modal::ModalDialogHost* ModalDialogHostImpl::Get(
}
class AthenaConstrainedWindowViewsClient
- : public ConstrainedWindowViewsClient {
+ : public constrained_window::ConstrainedWindowViewsClient {
public:
AthenaConstrainedWindowViewsClient() {}
~AthenaConstrainedWindowViewsClient() override {}
@@ -128,12 +128,12 @@ class AthenaConstrainedWindowViewsClient
} // namespace
void InstallConstrainedWindowViewsClient() {
- SetConstrainedWindowViewsClient(
+ constrained_window::SetConstrainedWindowViewsClient(
make_scoped_ptr(new AthenaConstrainedWindowViewsClient));
}
void UninstallConstrainedWindowViewsClient() {
- SetConstrainedWindowViewsClient(nullptr);
+ constrained_window::SetConstrainedWindowViewsClient(nullptr);
}
} // namespace athena
diff --git a/athena/extensions/athena_javascript_native_dialog_factory.cc b/athena/extensions/athena_javascript_native_dialog_factory.cc
index 6883a9e..b4b9fc4 100644
--- a/athena/extensions/athena_javascript_native_dialog_factory.cc
+++ b/athena/extensions/athena_javascript_native_dialog_factory.cc
@@ -29,7 +29,7 @@ class AthenaJavaScriptNativeDialogFactory
gfx::NativeWindow parent_window) override{
JavaScriptAppModalDialogViews* d =
new JavaScriptAppModalDialogViews(dialog);
- CreateBrowserModalDialogViews(d, parent_window);
+ constrained_window::CreateBrowserModalDialogViews(d, parent_window);
return d;
}
--
cgit v1.1