| Index: athena/extensions/shell/athena_shell_app_delegate.cc
|
| diff --git a/extensions/shell/browser/shell_app_delegate.cc b/athena/extensions/shell/athena_shell_app_delegate.cc
|
| similarity index 34%
|
| copy from extensions/shell/browser/shell_app_delegate.cc
|
| copy to athena/extensions/shell/athena_shell_app_delegate.cc
|
| index 483da67032d52a3c581f5b5c294284573962eaed..5761166359d31682a9c261d8bac7cb1c96020a91 100644
|
| --- a/extensions/shell/browser/shell_app_delegate.cc
|
| +++ b/athena/extensions/shell/athena_shell_app_delegate.cc
|
| @@ -2,97 +2,60 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "extensions/shell/browser/shell_app_delegate.h"
|
| +#include "athena/extensions/shell/athena_shell_app_delegate.h"
|
|
|
| -#include "extensions/common/constants.h"
|
| +#include "content/public/browser/web_contents.h"
|
| #include "extensions/shell/browser/media_capture_util.h"
|
|
|
| -namespace extensions {
|
| +namespace athena {
|
|
|
| -ShellAppDelegate::ShellAppDelegate() {
|
| +AthenaShellAppDelegate::AthenaShellAppDelegate() {
|
| }
|
|
|
| -ShellAppDelegate::~ShellAppDelegate() {
|
| +AthenaShellAppDelegate::~AthenaShellAppDelegate() {
|
| }
|
|
|
| -void ShellAppDelegate::InitWebContents(content::WebContents* web_contents) {
|
| -}
|
| -
|
| -void ShellAppDelegate::ResizeWebContents(content::WebContents* web_contents,
|
| - const gfx::Size& size) {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| -content::WebContents* ShellAppDelegate::OpenURLFromTab(
|
| - content::BrowserContext* context,
|
| - content::WebContents* source,
|
| - const content::OpenURLParams& params) {
|
| - NOTIMPLEMENTED();
|
| - return NULL;
|
| -}
|
| -
|
| -void ShellAppDelegate::AddNewContents(content::BrowserContext* context,
|
| - content::WebContents* new_contents,
|
| - WindowOpenDisposition disposition,
|
| - const gfx::Rect& initial_pos,
|
| - bool user_gesture,
|
| - bool* was_blocked) {
|
| +void AthenaShellAppDelegate::InitWebContents(
|
| + content::WebContents* web_contents) {
|
| + // TODO(oshima): Enable Favicon, Printing, e c. See
|
| + // athena_chrome_app_delegate.cc.
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -content::ColorChooser* ShellAppDelegate::ShowColorChooser(
|
| +content::ColorChooser* AthenaShellAppDelegate::ShowColorChooser(
|
| content::WebContents* web_contents,
|
| SkColor initial_color) {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| -void ShellAppDelegate::RunFileChooser(
|
| +void AthenaShellAppDelegate::RunFileChooser(
|
| content::WebContents* tab,
|
| const content::FileChooserParams& params) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void ShellAppDelegate::RequestMediaAccessPermission(
|
| +void AthenaShellAppDelegate::RequestMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| const content::MediaResponseCallback& callback,
|
| const extensions::Extension* extension) {
|
| - media_capture_util::GrantMediaStreamRequest(
|
| + extensions::media_capture_util::GrantMediaStreamRequest(
|
| web_contents, request, callback, extension);
|
| }
|
|
|
| -bool ShellAppDelegate::CheckMediaAccessPermission(
|
| +bool AthenaShellAppDelegate::CheckMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const GURL& security_origin,
|
| content::MediaStreamType type,
|
| - const Extension* extension) {
|
| - media_capture_util::VerifyMediaAccessPermission(type, extension);
|
| + const extensions::Extension* extension) {
|
| + extensions::media_capture_util::VerifyMediaAccessPermission(type, extension);
|
| return true;
|
| }
|
|
|
| -int ShellAppDelegate::PreferredIconSize() {
|
| - return extension_misc::EXTENSION_ICON_SMALL;
|
| -}
|
| -
|
| -gfx::ImageSkia ShellAppDelegate::GetAppDefaultIcon() {
|
| - NOTIMPLEMENTED();
|
| - return gfx::ImageSkia();
|
| -}
|
| -
|
| -void ShellAppDelegate::SetWebContentsBlocked(
|
| +void AthenaShellAppDelegate::SetWebContentsBlocked(
|
| content::WebContents* web_contents,
|
| bool blocked) {
|
| NOTIMPLEMENTED();
|
| }
|
| -
|
| -bool ShellAppDelegate::IsWebContentsVisible(
|
| - content::WebContents* web_contents) {
|
| - return true;
|
| -}
|
| -
|
| -void ShellAppDelegate::SetTerminatingCallback(const base::Closure& callback) {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| -} // namespace extensions
|
| +} // namespace athena
|
|
|