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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/browser/shell.cc ('k') | content/shell/browser/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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/shell.h" 5 #include "content/shell/browser/shell.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void Shell::PlatformSetContents() { 53 void Shell::PlatformSetContents() {
54 JNIEnv* env = AttachCurrentThread(); 54 JNIEnv* env = AttachCurrentThread();
55 Java_Shell_initFromNativeTabContents( 55 Java_Shell_initFromNativeTabContents(
56 env, java_object_.obj(), reinterpret_cast<intptr_t>(web_contents())); 56 env, java_object_.obj(), reinterpret_cast<intptr_t>(web_contents()));
57 } 57 }
58 58
59 void Shell::PlatformResizeSubViews() { 59 void Shell::PlatformResizeSubViews() {
60 // Not needed; subviews are bound. 60 // Not needed; subviews are bound.
61 } 61 }
62 62
63 void Shell::PlatformSetTitle(const string16& title) { 63 void Shell::PlatformSetTitle(const base::string16& title) {
64 NOTIMPLEMENTED(); 64 NOTIMPLEMENTED();
65 } 65 }
66 66
67 void Shell::LoadProgressChanged(WebContents* source, double progress) { 67 void Shell::LoadProgressChanged(WebContents* source, double progress) {
68 JNIEnv* env = AttachCurrentThread(); 68 JNIEnv* env = AttachCurrentThread();
69 Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress); 69 Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress);
70 } 70 }
71 71
72 void Shell::PlatformToggleFullscreenModeForTab(WebContents* web_contents, 72 void Shell::PlatformToggleFullscreenModeForTab(WebContents* web_contents,
73 bool enter_fullscreen) { 73 bool enter_fullscreen) {
(...skipping 13 matching lines...) Expand all
87 java_object_.Reset(); 87 java_object_.Reset();
88 delete this; 88 delete this;
89 } 89 }
90 90
91 // static 91 // static
92 bool Shell::Register(JNIEnv* env) { 92 bool Shell::Register(JNIEnv* env) {
93 return RegisterNativesImpl(env); 93 return RegisterNativesImpl(env);
94 } 94 }
95 95
96 } // namespace content 96 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell.cc ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698