| Index: apps/shell/browser/api/shell/shell_api.cc
|
| diff --git a/apps/shell/browser/api/shell/shell_api.cc b/apps/shell/browser/api/shell/shell_api.cc
|
| deleted file mode 100644
|
| index 53a7bb64c526a83daf78dc5e70ff80d38ee9b2f0..0000000000000000000000000000000000000000
|
| --- a/apps/shell/browser/api/shell/shell_api.cc
|
| +++ /dev/null
|
| @@ -1,59 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "apps/shell/browser/api/shell/shell_api.h"
|
| -
|
| -#include "apps/shell/browser/shell_app_window.h"
|
| -#include "apps/shell/browser/shell_desktop_controller.h"
|
| -#include "apps/shell/common/api/shell.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "base/values.h"
|
| -#include "extensions/common/extension.h"
|
| -
|
| -using base::DictionaryValue;
|
| -
|
| -namespace CreateWindow = apps::shell_api::shell::CreateWindow;
|
| -
|
| -namespace apps {
|
| -namespace {
|
| -
|
| -const char kInvalidArguments[] = "Invalid arguments";
|
| -
|
| -// Creates a function call result to send to the renderer.
|
| -DictionaryValue* CreateResult(apps::ShellAppWindow* app_window) {
|
| - int view_id = app_window->GetRenderViewRoutingID();
|
| -
|
| - DictionaryValue* result = new DictionaryValue;
|
| - result->Set("viewId", new base::FundamentalValue(view_id));
|
| - return result;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -ShellCreateWindowFunction::ShellCreateWindowFunction() {
|
| -}
|
| -
|
| -ShellCreateWindowFunction::~ShellCreateWindowFunction() {
|
| -}
|
| -
|
| -ExtensionFunction::ResponseAction ShellCreateWindowFunction::Run() {
|
| - scoped_ptr<CreateWindow::Params> params(CreateWindow::Params::Create(*args_));
|
| - EXTENSION_FUNCTION_VALIDATE(params.get());
|
| -
|
| - // Convert "main.html" to "chrome-extension:/<id>/main.html".
|
| - GURL url = GetExtension()->GetResourceURL(params->url);
|
| - if (!url.is_valid())
|
| - return RespondNow(Error(kInvalidArguments));
|
| -
|
| - // The desktop keeps ownership of the window.
|
| - apps::ShellAppWindow* app_window =
|
| - apps::ShellDesktopController::instance()->CreateAppWindow(
|
| - browser_context());
|
| - app_window->LoadURL(url);
|
| -
|
| - // Create the reply to send to the renderer.
|
| - return RespondNow(OneArgument(CreateResult(app_window)));
|
| -}
|
| -
|
| -} // namespace apps
|
|
|