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

Unified Diff: extensions/shell/browser/shell_app_window.cc

Issue 412713002: Move apps/shell to extensions/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 40% Created 6 years, 5 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
« no previous file with comments | « extensions/shell/browser/shell_app_window.h ('k') | extensions/shell/browser/shell_app_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_app_window.cc
diff --git a/apps/shell/browser/shell_app_window.cc b/extensions/shell/browser/shell_app_window.cc
similarity index 79%
rename from apps/shell/browser/shell_app_window.cc
rename to extensions/shell/browser/shell_app_window.cc
index 8015ff5fda3f76b3a0d4e9d79e0de744891c62e8..a66554ea1ca03f7e7b7292684f9fc5984e334fdb 100644
--- a/apps/shell/browser/shell_app_window.cc
+++ b/extensions/shell/browser/shell_app_window.cc
@@ -2,28 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/shell/browser/shell_app_window.h"
+#include "extensions/shell/browser/shell_app_window.h"
-#include "apps/shell/browser/shell_extension_web_contents_observer.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
#include "extensions/browser/view_type_utils.h"
#include "extensions/common/extension_messages.h"
+#include "extensions/shell/browser/shell_extension_web_contents_observer.h"
#include "ipc/ipc_message_macros.h"
using content::BrowserContext;
using content::WebContents;
-namespace apps {
+namespace extensions {
-ShellAppWindow::ShellAppWindow() {}
+ShellAppWindow::ShellAppWindow() {
+}
-ShellAppWindow::~ShellAppWindow() {}
+ShellAppWindow::~ShellAppWindow() {
+}
void ShellAppWindow::Init(BrowserContext* context, gfx::Size initial_size) {
extension_function_dispatcher_.reset(
- new extensions::ExtensionFunctionDispatcher(context, this));
+ new ExtensionFunctionDispatcher(context, this));
// Create the web contents with an initial size to avoid a resize.
WebContents::CreateParams create_params(context);
@@ -33,11 +35,9 @@ void ShellAppWindow::Init(BrowserContext* context, gfx::Size initial_size) {
content::WebContentsObserver::Observe(web_contents_.get());
// Add support for extension startup.
- extensions::ShellExtensionWebContentsObserver::CreateForWebContents(
- web_contents_.get());
+ ShellExtensionWebContentsObserver::CreateForWebContents(web_contents_.get());
- extensions::SetViewType(web_contents_.get(),
- extensions::VIEW_TYPE_APP_WINDOW);
+ SetViewType(web_contents_.get(), VIEW_TYPE_APP_WINDOW);
}
void ShellAppWindow::LoadURL(const GURL& url) {
@@ -72,4 +72,4 @@ void ShellAppWindow::OnRequest(const ExtensionHostMsg_Request_Params& params) {
web_contents_->GetRenderViewHost());
}
-} // namespace apps
+} // namespace extensions
« no previous file with comments | « extensions/shell/browser/shell_app_window.h ('k') | extensions/shell/browser/shell_app_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698