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

Side by Side Diff: blimp/client/android/toolbar.cc

Issue 1570943002: [Blimp client] Move client code into blimp::client namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 | « blimp/client/android/toolbar.h ('k') | blimp/client/blimp_startup.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "blimp/client/android/toolbar.h" 5 #include "blimp/client/android/toolbar.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "blimp/client/session/blimp_client_session_android.h" 8 #include "blimp/client/session/blimp_client_session_android.h"
9 #include "jni/Toolbar_jni.h" 9 #include "jni/Toolbar_jni.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
11 #include "ui/gfx/android/java_bitmap.h" 11 #include "ui/gfx/android/java_bitmap.h"
12 #include "url/gurl.h" 12 #include "url/gurl.h"
13 13
14 namespace blimp { 14 namespace blimp {
15 namespace client {
15 16
16 namespace { 17 namespace {
17 18
18 const int kDummyTabId = 0; 19 const int kDummyTabId = 0;
19 20
20 } // namespace 21 } // namespace
21 22
22 static jlong Init(JNIEnv* env, 23 static jlong Init(JNIEnv* env,
23 const JavaParamRef<jobject>& jobj, 24 const JavaParamRef<jobject>& jobj,
24 const JavaParamRef<jobject>& blimp_client_session) { 25 const JavaParamRef<jobject>& blimp_client_session) {
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 } 101 }
101 102
102 void Toolbar::OnLoadingChanged(int tab_id, bool loading) { 103 void Toolbar::OnLoadingChanged(int tab_id, bool loading) {
103 JNIEnv* env = base::android::AttachCurrentThread(); 104 JNIEnv* env = base::android::AttachCurrentThread();
104 105
105 Java_Toolbar_onEngineSentLoading(env, 106 Java_Toolbar_onEngineSentLoading(env,
106 java_obj_.obj(), 107 java_obj_.obj(),
107 static_cast<jboolean>(loading)); 108 static_cast<jboolean>(loading));
108 } 109 }
109 110
111 } // namespace client
110 } // namespace blimp 112 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/client/android/toolbar.h ('k') | blimp/client/blimp_startup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698