| Index: athena/content/web_activity.cc
|
| diff --git a/athena/content/web_activity.cc b/athena/content/web_activity.cc
|
| index 85ede624a7f6383ceb3c3bc5f9e846e920038617..50d71c925d27efe11e4712b55be55b2b74c310f3 100644
|
| --- a/athena/content/web_activity.cc
|
| +++ b/athena/content/web_activity.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "athena/activity/public/activity_factory.h"
|
| #include "athena/activity/public/activity_manager.h"
|
| +#include "athena/content/public/dialogs.h"
|
| #include "athena/input/public/accelerator_manager.h"
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| @@ -302,6 +303,20 @@ class AthenaWebView : public views::WebView {
|
| layer->SetOpacity(0.f);
|
| }
|
|
|
| + virtual content::ColorChooser* OpenColorChooser(
|
| + content::WebContents* web_contents,
|
| + SkColor color,
|
| + const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE {
|
| + return athena::OpenColorChooser(web_contents, color, suggestions);
|
| + }
|
| +
|
| + // Called when a file selection is to be done.
|
| + virtual void RunFileChooser(
|
| + content::WebContents* web_contents,
|
| + const content::FileChooserParams& params) OVERRIDE {
|
| + return athena::OpenFileChooser(web_contents, params);
|
| + }
|
| +
|
| private:
|
| void CreateProgressBar() {
|
| CHECK(!progress_bar_);
|
|
|