diff options
author | oshima <oshima@chromium.org> | 2014-11-10 14:21:23 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-10 22:22:37 +0000 |
commit | dd3db6a1bb9b162e4f55e9c16b2890a4b60bef03 (patch) | |
tree | 3372b68fcd566be410ea43885332387781a62343 /athena | |
parent | 5be808e0b7478b27304f5a29b47ba1af1de627d2 (diff) | |
download | chromium_src-dd3db6a1bb9b162e4f55e9c16b2890a4b60bef03.zip chromium_src-dd3db6a1bb9b162e4f55e9c16b2890a4b60bef03.tar.gz chromium_src-dd3db6a1bb9b162e4f55e9c16b2890a4b60bef03.tar.bz2 |
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}
Diffstat (limited to 'athena')
-rw-r--r-- | athena/extensions/athena_constrained_window_views_client.cc | 6 | ||||
-rw-r--r-- | athena/extensions/athena_javascript_native_dialog_factory.cc | 2 |
2 files changed, 4 insertions, 4 deletions
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; } |