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

Side by Side Diff: athena/content/web_activity.cc

Issue 691823002: Add WebContents source to methods in WebContentsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 unified diff | Download patch
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « apps/custom_launcher_page_contents.cc ('k') | chrome/browser/android/chrome_web_contents_delegate_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698