OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "athena/content/web_activity.h" | 5 #include "athena/content/web_activity.h" |
6 | 6 |
7 #include "athena/activity/public/activity_factory.h" | 7 #include "athena/activity/public/activity_factory.h" |
8 #include "athena/activity/public/activity_manager.h" | 8 #include "athena/activity/public/activity_manager.h" |
9 #include "athena/activity/public/activity_view.h" | 9 #include "athena/activity/public/activity_view.h" |
10 #include "athena/content/content_proxy.h" | 10 #include "athena/content/content_proxy.h" |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 return; | 358 return; |
359 | 359 |
360 ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator()); | 360 ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator()); |
361 settings.SetTweenType(gfx::Tween::EASE_IN); | 361 settings.SetTweenType(gfx::Tween::EASE_IN); |
362 ui::Layer* layer = progress_bar_.get(); | 362 ui::Layer* layer = progress_bar_.get(); |
363 settings.AddObserver(new ui::ClosureAnimationObserver( | 363 settings.AddObserver(new ui::ClosureAnimationObserver( |
364 base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release()))); | 364 base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release()))); |
365 layer->SetOpacity(0.f); | 365 layer->SetOpacity(0.f); |
366 } | 366 } |
367 | 367 |
368 content::JavaScriptDialogManager* GetJavaScriptDialogManager() override { | 368 content::JavaScriptDialogManager* GetJavaScriptDialogManager( |
| 369 content::WebContents* contents) override { |
369 return GetJavaScriptDialogManagerInstance(); | 370 return GetJavaScriptDialogManagerInstance(); |
370 } | 371 } |
371 | 372 |
372 content::ColorChooser* OpenColorChooser( | 373 content::ColorChooser* OpenColorChooser( |
373 content::WebContents* web_contents, | 374 content::WebContents* web_contents, |
374 SkColor color, | 375 SkColor color, |
375 const std::vector<content::ColorSuggestion>& suggestions) override { | 376 const std::vector<content::ColorSuggestion>& suggestions) override { |
376 return athena::OpenColorChooser(web_contents, color, suggestions); | 377 return athena::OpenColorChooser(web_contents, color, suggestions); |
377 } | 378 } |
378 | 379 |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
653 if (content_proxy_.get()) | 654 if (content_proxy_.get()) |
654 content_proxy_.reset(nullptr); | 655 content_proxy_.reset(nullptr); |
655 } | 656 } |
656 | 657 |
657 void WebActivity::ShowContentProxy() { | 658 void WebActivity::ShowContentProxy() { |
658 if (!content_proxy_.get()) | 659 if (!content_proxy_.get()) |
659 content_proxy_.reset(new ContentProxy(web_view_)); | 660 content_proxy_.reset(new ContentProxy(web_view_)); |
660 } | 661 } |
661 | 662 |
662 } // namespace athena | 663 } // namespace athena |
OLD | NEW |