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

Unified Diff: content/shell/shell_android.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | « content/shell/shell.cc ('k') | content/shell/shell_application_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_android.cc
diff --git a/content/shell/shell_android.cc b/content/shell/shell_android.cc
deleted file mode 100644
index d12d0d7a09e9fdc18eac615ff6dc5c1a87fb6f18..0000000000000000000000000000000000000000
--- a/content/shell/shell_android.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) 2012 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 "content/shell/shell.h"
-
-#include <jni.h>
-
-#include "base/android/jni_string.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/strings/string_piece.h"
-#include "content/public/common/content_switches.h"
-#include "content/shell/android/shell_manager.h"
-#include "jni/Shell_jni.h"
-
-using base::android::AttachCurrentThread;
-using base::android::ConvertUTF8ToJavaString;
-
-namespace content {
-
-void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- DCHECK(command_line->HasSwitch(switches::kForceCompositingMode));
- DCHECK(command_line->HasSwitch(switches::kEnableThreadedCompositing));
-}
-
-void Shell::PlatformCleanUp() {
-}
-
-void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
-}
-
-void Shell::PlatformSetAddressBarURL(const GURL& url) {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, url.spec());
- Java_Shell_onUpdateUrl(env, java_object_.obj(), j_url.obj());
-}
-
-void Shell::PlatformSetIsLoading(bool loading) {
- JNIEnv* env = AttachCurrentThread();
- Java_Shell_setIsLoading(env, java_object_.obj(), loading);
-}
-
-void Shell::PlatformCreateWindow(int width, int height) {
- java_object_.Reset(AttachCurrentThread(), CreateShellView(this));
-}
-
-void Shell::PlatformSetContents() {
- JNIEnv* env = AttachCurrentThread();
- Java_Shell_initFromNativeTabContents(
- env, java_object_.obj(), reinterpret_cast<jint>(web_contents()));
-}
-
-void Shell::PlatformResizeSubViews() {
- // Not needed; subviews are bound.
-}
-
-void Shell::PlatformSetTitle(const string16& title) {
- NOTIMPLEMENTED();
-}
-
-void Shell::LoadProgressChanged(WebContents* source, double progress) {
- JNIEnv* env = AttachCurrentThread();
- Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress);
-}
-
-void Shell::PlatformToggleFullscreenModeForTab(WebContents* web_contents,
- bool enter_fullscreen) {
- JNIEnv* env = AttachCurrentThread();
- Java_Shell_toggleFullscreenModeForTab(
- env, java_object_.obj(), enter_fullscreen);
-}
-
-bool Shell::PlatformIsFullscreenForTabOrPending(
- const WebContents* web_contents) const {
- JNIEnv* env = AttachCurrentThread();
- return Java_Shell_isFullscreenForTabOrPending(env, java_object_.obj());
-}
-
-void Shell::Close() {
- CloseShellView(java_object_.obj());
- java_object_.Reset();
- delete this;
-}
-
-// static
-bool Shell::Register(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-} // namespace content
« no previous file with comments | « content/shell/shell.cc ('k') | content/shell/shell_application_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698