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

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

Issue 650033004: Add NOTIMPLEMENTED for methods that should be implemented (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « no previous file | athena/content/web_contents_view_delegate_factory_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/content/content_proxy.h" 9 #include "athena/content/content_proxy.h"
10 #include "athena/content/media_utils.h" 10 #include "athena/content/media_utils.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 return; 349 return;
350 350
351 ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator()); 351 ui::ScopedLayerAnimationSettings settings(progress_bar_->GetAnimator());
352 settings.SetTweenType(gfx::Tween::EASE_IN); 352 settings.SetTweenType(gfx::Tween::EASE_IN);
353 ui::Layer* layer = progress_bar_.get(); 353 ui::Layer* layer = progress_bar_.get();
354 settings.AddObserver(new ui::ClosureAnimationObserver( 354 settings.AddObserver(new ui::ClosureAnimationObserver(
355 base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release()))); 355 base::Bind(&base::DeletePointer<ui::Layer>, progress_bar_.release())));
356 layer->SetOpacity(0.f); 356 layer->SetOpacity(0.f);
357 } 357 }
358 358
359 virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
360 override {
361 NOTIMPLEMENTED();
362 return NULL;
363 }
364
359 virtual content::ColorChooser* OpenColorChooser( 365 virtual content::ColorChooser* OpenColorChooser(
360 content::WebContents* web_contents, 366 content::WebContents* web_contents,
361 SkColor color, 367 SkColor color,
362 const std::vector<content::ColorSuggestion>& suggestions) override { 368 const std::vector<content::ColorSuggestion>& suggestions) override {
363 return athena::OpenColorChooser(web_contents, color, suggestions); 369 return athena::OpenColorChooser(web_contents, color, suggestions);
364 } 370 }
365 371
366 // Called when a file selection is to be done. 372 // Called when a file selection is to be done.
367 virtual void RunFileChooser( 373 virtual void RunFileChooser(
368 content::WebContents* web_contents, 374 content::WebContents* web_contents,
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 if (content_proxy_.get()) 633 if (content_proxy_.get())
628 content_proxy_.reset(NULL); 634 content_proxy_.reset(NULL);
629 } 635 }
630 636
631 void WebActivity::ShowContentProxy() { 637 void WebActivity::ShowContentProxy() {
632 if (!content_proxy_.get()) 638 if (!content_proxy_.get())
633 content_proxy_.reset(new ContentProxy(web_view_)); 639 content_proxy_.reset(new ContentProxy(web_view_));
634 } 640 }
635 641
636 } // namespace athena 642 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | athena/content/web_contents_view_delegate_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698