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

Side by Side Diff: content/shell/shell_android.cc

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 years, 10 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 unified diff | Download patch
« no previous file with comments | « content/shell/shell.cc ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell.h" 5 #include "content/shell/shell.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/string_piece.h" 13 #include "base/string_piece.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/shell/android/shell_manager.h" 15 #include "content/shell/android/shell_manager.h"
16 #include "jni/Shell_jni.h" 16 #include "jni/Shell_jni.h"
17 17
18 using base::android::AttachCurrentThread; 18 using base::android::AttachCurrentThread;
19 using base::android::ConvertUTF8ToJavaString; 19 using base::android::ConvertUTF8ToJavaString;
20 20
21 namespace content { 21 namespace content {
22 22
23 void Shell::PlatformInitialize() { 23 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
24 CommandLine* command_line = CommandLine::ForCurrentProcess(); 24 CommandLine* command_line = CommandLine::ForCurrentProcess();
25 DCHECK(command_line->HasSwitch(switches::kForceCompositingMode)); 25 DCHECK(command_line->HasSwitch(switches::kForceCompositingMode));
26 DCHECK(command_line->HasSwitch(switches::kEnableThreadedCompositing)); 26 DCHECK(command_line->HasSwitch(switches::kEnableThreadedCompositing));
27 } 27 }
28 28
29 void Shell::PlatformCleanUp() { 29 void Shell::PlatformCleanUp() {
30 } 30 }
31 31
32 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { 32 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
33 } 33 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // TODO(tedchoc): Implement Close method for android shell 83 // TODO(tedchoc): Implement Close method for android shell
84 NOTIMPLEMENTED(); 84 NOTIMPLEMENTED();
85 } 85 }
86 86
87 // static 87 // static
88 bool Shell::Register(JNIEnv* env) { 88 bool Shell::Register(JNIEnv* env) {
89 return RegisterNativesImpl(env); 89 return RegisterNativesImpl(env);
90 } 90 }
91 91
92 } // namespace content 92 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell.cc ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698