| OLD | NEW |
| 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 package org.chromium.content.browser; | 5 package org.chromium.content.browser; |
| 6 | 6 |
| 7 import android.content.ComponentName; | 7 import android.content.ComponentName; |
| 8 import android.content.Context; | 8 import android.content.Context; |
| 9 import android.content.Intent; | 9 import android.content.Intent; |
| 10 import android.content.ServiceConnection; | 10 import android.content.ServiceConnection; |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 return mInSandbox; | 302 return mInSandbox; |
| 303 } | 303 } |
| 304 | 304 |
| 305 @Override | 305 @Override |
| 306 public String getPackageName() { | 306 public String getPackageName() { |
| 307 return mCreationParams != null ? mCreationParams.getPackageName() | 307 return mCreationParams != null ? mCreationParams.getPackageName() |
| 308 : mContext.getPackageName(); | 308 : mContext.getPackageName(); |
| 309 } | 309 } |
| 310 | 310 |
| 311 @Override | 311 @Override |
| 312 public ChildProcessCreationParams getCreationParams() { |
| 313 return mCreationParams; |
| 314 } |
| 315 |
| 316 @Override |
| 312 public IChildProcessService getService() { | 317 public IChildProcessService getService() { |
| 313 synchronized (mLock) { | 318 synchronized (mLock) { |
| 314 return mService; | 319 return mService; |
| 315 } | 320 } |
| 316 } | 321 } |
| 317 | 322 |
| 318 @Override | 323 @Override |
| 319 public int getPid() { | 324 public int getPid() { |
| 320 synchronized (mLock) { | 325 synchronized (mLock) { |
| 321 return mPid; | 326 return mPid; |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 return true; | 556 return true; |
| 552 } | 557 } |
| 553 return false; | 558 return false; |
| 554 } | 559 } |
| 555 | 560 |
| 556 @VisibleForTesting | 561 @VisibleForTesting |
| 557 public boolean isConnected() { | 562 public boolean isConnected() { |
| 558 return mService != null; | 563 return mService != null; |
| 559 } | 564 } |
| 560 } | 565 } |
| OLD | NEW |