chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java - Issue 1178323005: Move remaining resources from java_staging/res to java/res.

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: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default

Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java_staging/res/xml/main_preferences.xml ('k') | chrome/android/shell/res/menu/chrome_shell_main_menu.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

index 28fa14992618ab81f86e1399734c5826f1fb0c5b..6c12fb57d647c558d50c5313e1dc3ad455a9f4db 100644

--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

@@ -189,7 +189,8 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro

mTabManager.setStartupUrl(startupUrl);

}

mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar);

- mAppMenuHandler = sAppMenuHandlerFactory.getAppMenuHandler(this, this, R.menu.main_menu);

+ mAppMenuHandler = sAppMenuHandlerFactory.getAppMenuHandler(this, this,

+ R.menu.chrome_shell_main_menu);

mToolbar.setMenuHandler(mAppMenuHandler);

mDevToolsServer = new DevToolsServer("chrome_shell");