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

Unified Diff: athena/content/web_activity.cc

Issue 544953003: Supprot V2 app: step1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
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_);

Powered by Google App Engine
This is Rietveld 408576698