blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java - Issue 2493333002: Move Java Blimp shell code to app subpackage

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java

Issue 2493333002: Move Java Blimp shell code to app subpackage (Closed)

Patch Set: Merge branch 'refs/heads/master' into blimp-shell-integration Created 4 years, 1 month 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 | « blimp/client/app/android/java/src/org/chromium/blimp/app/settings/Preferences.java ('k') | blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/ToolbarMenu.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java

diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java b/blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java

similarity index 98%

rename from blimp/client/app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java

rename to blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java

index 93dfaf0365df04a9d3962fa783d03b3b4cc71895..b1c11e9d47a39484133d2d76d567c58e8518f55b 100644

--- a/blimp/client/app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java

+++ b/blimp/client/app/android/java/src/org/chromium/blimp/app/toolbar/Toolbar.java

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-package org.chromium.blimp.toolbar;

+package org.chromium.blimp.app.toolbar;

import android.content.Context;

import android.graphics.Bitmap;

@@ -15,8 +15,8 @@ import android.widget.ProgressBar;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

-import org.chromium.blimp.R;

-import org.chromium.blimp.session.BlimpClientSession;

+import org.chromium.blimp.app.R;

+import org.chromium.blimp.app.session.BlimpClientSession;

/**

* A {@link View} that visually represents the Blimp toolbar, which lets users issue navigation