29 files changed, 22 insertions, 17 deletions
diff --git a/chrome/browser/resources/chromeos/OWNERS b/chrome/browser/resources/chromeos/OWNERS
new file mode 100644
index 0000000..a0eb636
--- /dev/null
+++ b/chrome/browser/resources/chromeos/OWNERS
@@ -0,0 +1,5 @@
+xiyuan@chromium.org
+nkostylev@chromium.org
+achuith@chromium.org
+zelidrag@chromium.org
+rbyers@chromium.org
diff --git a/chrome/browser/resources/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html
index 76786ff..76786ff 100644
--- a/chrome/browser/resources/about_os_credits.html
+++ b/chrome/browser/resources/chromeos/about_os_credits.html
diff --git a/chrome/browser/resources/about_sys.html b/chrome/browser/resources/chromeos/about_sys.html
index 14524da..4f02294 100644
--- a/chrome/browser/resources/about_sys.html
+++ b/chrome/browser/resources/chromeos/about_sys.html
@@ -62,7 +62,7 @@ html[dir='rtl'] #header {
   -webkit-padding-start: 3em;
   margin: 0;
   display: inline;
-  background: url('shared/images/gear.png') no-repeat;
+  background: url('../shared/images/gear.png') no-repeat;
   background-position: 12px 60%;
   color: white;
 }
@@ -176,7 +176,7 @@ html[dir='rtl'] .globalButton {
   float: right;
 }
 </style>
-<script src="shared/js/local_strings.js"></script>
+<script src="chrome://resources/js/local_strings.js"></script>
 <script>
 var localStrings;
 
diff --git a/chrome/browser/resources/access_chromevox/manifest.json b/chrome/browser/resources/chromeos/access_chromevox/manifest.json
index aab876b..aab876b 100644
--- a/chrome/browser/resources/access_chromevox/manifest.json
+++ b/chrome/browser/resources/chromeos/access_chromevox/manifest.json
diff --git a/chrome/browser/resources/active_downloads.html b/chrome/browser/resources/chromeos/active_downloads.html
index f90eaf7..780a387 100644
--- a/chrome/browser/resources/active_downloads.html
+++ b/chrome/browser/resources/chromeos/active_downloads.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title i18n-content="title"></title>
-<link rel="icon" href="../../app/theme/downloads_favicon.png">
+<link rel="icon" href="../../../app/theme/downloads_favicon.png">
 <style type="text/css">
 *:-khtml-drag {
   background-color: rgba(238,238,238, 0.5);
@@ -25,7 +25,7 @@ ul.downloadlist {
   margin: 20px auto auto auto;
   height: 4px;
   width: 5px;
-  background: url('shared/images/active_downloads_menu.png') no-repeat;
+  background: url('../shared/images/active_downloads_menu.png') no-repeat;
 }
 
 .menubutton {
@@ -82,7 +82,7 @@ html[dir=rtl] .menubutton {
   margin-top: 1px;
   width: 37px;
   height: 30px;
-  background: url('shared/images/icon_warning2.png') no-repeat;
+  background: url('../shared/images/icon_warning2.png') no-repeat;
 }
 
 .rowbutton span.title {
diff --git a/chrome/browser/resources/active_downloads.js b/chrome/browser/resources/chromeos/active_downloads.js
index c7ad119..c7ad119 100644
--- a/chrome/browser/resources/active_downloads.js
+++ b/chrome/browser/resources/chromeos/active_downloads.js
diff --git a/chrome/browser/resources/gaia_auth/manifest.json b/chrome/browser/resources/chromeos/gaia_auth/manifest.json
index 3a3b5d7..3a3b5d7 100644
--- a/chrome/browser/resources/gaia_auth/manifest.json
+++ b/chrome/browser/resources/chromeos/gaia_auth/manifest.json
diff --git a/chrome/browser/resources/gaia_auth/manifest_test.json b/chrome/browser/resources/chromeos/gaia_auth/manifest_test.json
index ab1236d..ab1236d 100644
--- a/chrome/browser/resources/gaia_auth/manifest_test.json
+++ b/chrome/browser/resources/chromeos/gaia_auth/manifest_test.json
diff --git a/chrome/browser/resources/guest_session_tab.html b/chrome/browser/resources/chromeos/guest_session_tab.html
index 06a99be..5915b22 100644
--- a/chrome/browser/resources/guest_session_tab.html
+++ b/chrome/browser/resources/chromeos/guest_session_tab.html
@@ -2,7 +2,7 @@
 <html i18n-values="dir:textdirection;">
 <head>
 <title i18n-content="title"></title>
-<link rel="stylesheet" href="incognito_tab.css">
+<link rel="stylesheet" href="../incognito_tab.css">
 <script>
 // Until themes can clear the cache, force-reload the theme stylesheet.
 document.write('<link id="incognitothemecss" rel="stylesheet" ' +
@@ -12,7 +12,7 @@ document.write('<link id="incognitothemecss" rel="stylesheet" ' +
 </head>
 <body>
 <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
-  <img src="shared/images/guest_icon_standalone.png" class="icon" />
+  <img src="../shared/images/guest_icon_standalone.png" class="icon" />
   <span i18n-values=".innerHTML:content"></span>
 </div>
 </body>
diff --git a/chrome/browser/resources/host_registration_page.html b/chrome/browser/resources/chromeos/host_registration_page.html
index fc86439..fc86439 100644
--- a/chrome/browser/resources/host_registration_page.html
+++ b/chrome/browser/resources/chromeos/host_registration_page.html
diff --git a/chrome/browser/resources/image_burner.html b/chrome/browser/resources/chromeos/image_burner.html
index fc2f1df..768ff25 100644
--- a/chrome/browser/resources/image_burner.html
+++ b/chrome/browser/resources/chromeos/image_burner.html
@@ -129,19 +129,19 @@ html[dir='rtl'] .float-start {
 }
 
 #main-content.device-detected-none #status-icon {
-  background: url('shared/images/insert.png');
+  background: url('../shared/images/insert.png');
   background-repeat: no-repeat;
   display: block;
 }
 
 #main-content.device-detected-usb #status-icon {
-  background: url('shared/images/detected_usb.png');
+  background: url('../shared/images/detected_usb.png');
   background-repeat: no-repeat;
   display: block;
 }
 
 #main-content.device-detected-sd #status-icon {
-  background: url('shared/images/detected_sd.png');
+  background: url('../shared/images/detected_sd.png');
   background-repeat: no-repeat;
   display: block;
 }
@@ -184,13 +184,13 @@ html[dir='rtl'] .float-start {
 }
 
 #main-content.warning #warning-icon, #main-content.error #warning-icon {
-  background:url('shared/images/icon_warning.png');
+  background:url('../shared/images/icon_warning.png');
   background-repeat:no-repeat;
   display: block;
 }
 
 #main-content.success #warning-icon {
-  background:url('shared/images/icon_checkmark.png');
+  background:url('../shared/images/icon_checkmark.png');
   background-repeat:no-repeat;
   display: block;
 }
diff --git a/chrome/browser/resources/image_burner.js b/chrome/browser/resources/chromeos/image_burner.js
index b81f578..b81f578 100644
--- a/chrome/browser/resources/image_burner.js
+++ b/chrome/browser/resources/chromeos/image_burner.js
diff --git a/chrome/browser/resources/keyboard_overlay.css b/chrome/browser/resources/chromeos/keyboard_overlay.css
index 9fc7a16..9fc7a16 100644
--- a/chrome/browser/resources/keyboard_overlay.css
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.css
diff --git a/chrome/browser/resources/keyboard_overlay.html b/chrome/browser/resources/chromeos/keyboard_overlay.html
index 1c6fcc0..1c6fcc0 100644
--- a/chrome/browser/resources/keyboard_overlay.html
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.html
diff --git a/chrome/browser/resources/keyboard_overlay.js b/chrome/browser/resources/chromeos/keyboard_overlay.js
index 3554dce..3554dce 100644
--- a/chrome/browser/resources/keyboard_overlay.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.js
diff --git a/chrome/browser/resources/keyboard_overlay_accessibility_helper.js b/chrome/browser/resources/chromeos/keyboard_overlay_accessibility_helper.js
index c28a500..c28a500 100644
--- a/chrome/browser/resources/keyboard_overlay_accessibility_helper.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay_accessibility_helper.js
diff --git a/chrome/browser/resources/keyboard_overlay_data.js b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
index 8fdcd0b..8fdcd0b 100644
--- a/chrome/browser/resources/keyboard_overlay_data.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
diff --git a/chrome/browser/resources/menu.css b/chrome/browser/resources/chromeos/menu.css
index 16ade9f..16ade9f 100644
--- a/chrome/browser/resources/menu.css
+++ b/chrome/browser/resources/chromeos/menu.css
diff --git a/chrome/browser/resources/menu.html b/chrome/browser/resources/chromeos/menu.html
index ea88119..21e3d57 100644
--- a/chrome/browser/resources/menu.html
+++ b/chrome/browser/resources/chromeos/menu.html
@@ -3,9 +3,9 @@
   <head>
     <meta charset="utf-8">
     <link rel="stylesheet" href="menu.css">
-    <script src="shared/js/cr.js"></script>
-    <script src="shared/js/cr/ui.js"></script>
-    <script src="shared/js/local_strings.js"></script>
+    <script src="chrome://resources/js/cr.js"></script>
+    <script src="chrome://resources/js/cr/ui.js"></script>
+    <script src="chrome://resources/js/local_strings.js"></script>
     <script src="menu.js"></script>
     <style i18n-content="menu_css"></style>
     <script i18n-content="menu_source"></script>
diff --git a/chrome/browser/resources/menu.js b/chrome/browser/resources/chromeos/menu.js
index 68fc48e..68fc48e 100644
--- a/chrome/browser/resources/menu.js
+++ b/chrome/browser/resources/chromeos/menu.js
diff --git a/chrome/browser/resources/mobile_app/manifest.json b/chrome/browser/resources/chromeos/mobile_app/manifest.json
index 22caa8a..22caa8a 100644
--- a/chrome/browser/resources/mobile_app/manifest.json
+++ b/chrome/browser/resources/chromeos/mobile_app/manifest.json
diff --git a/chrome/browser/resources/mobile_setup.html b/chrome/browser/resources/chromeos/mobile_setup.html
index 1c75351..1c75351 100644
--- a/chrome/browser/resources/mobile_setup.html
+++ b/chrome/browser/resources/chromeos/mobile_setup.html
diff --git a/chrome/browser/resources/mobile_setup.js b/chrome/browser/resources/chromeos/mobile_setup.js
index 179c1c9..179c1c9 100644
--- a/chrome/browser/resources/mobile_setup.js
+++ b/chrome/browser/resources/chromeos/mobile_setup.js
diff --git a/chrome/browser/resources/network_menu.css b/chrome/browser/resources/chromeos/network_menu.css
index c718a6d..c718a6d 100644
--- a/chrome/browser/resources/network_menu.css
+++ b/chrome/browser/resources/chromeos/network_menu.css
diff --git a/chrome/browser/resources/network_menu.js b/chrome/browser/resources/chromeos/network_menu.js
index d1396dd..d1396dd 100644
--- a/chrome/browser/resources/network_menu.js
+++ b/chrome/browser/resources/chromeos/network_menu.js
diff --git a/chrome/browser/resources/notification_icon_link.html b/chrome/browser/resources/chromeos/notification_icon_link.html
index 9e75838..9e75838 100644
--- a/chrome/browser/resources/notification_icon_link.html
+++ b/chrome/browser/resources/chromeos/notification_icon_link.html
diff --git a/chrome/browser/resources/offline_load.html b/chrome/browser/resources/chromeos/offline_load.html
index 06bc4c8..714f162 100644
--- a/chrome/browser/resources/offline_load.html
+++ b/chrome/browser/resources/chromeos/offline_load.html
@@ -101,7 +101,7 @@ body {
   height: 1px;
 }
 </style>
-<script src="shared/js/local_strings.js"></script>
+<script src="chrome://resources/js/local_strings.js"></script>
 
 <script>
 var localStrings = new LocalStrings();
diff --git a/chrome/browser/resources/wrench_menu.css b/chrome/browser/resources/chromeos/wrench_menu.css
index b696068..a12a41d 100644
--- a/chrome/browser/resources/wrench_menu.css
+++ b/chrome/browser/resources/chromeos/wrench_menu.css
@@ -1,5 +1,5 @@
 .fullscreen {
-  background-image: url('../../app/theme/fullscreen_menu_button.png');
+  background-image: url('../../../app/theme/fullscreen_menu_button.png');
   background-position: center center;
   background-repeat: no-repeat;
   border: solid 1px rgba(0, 0, 0, 0.3);
diff --git a/chrome/browser/resources/wrench_menu.js b/chrome/browser/resources/chromeos/wrench_menu.js
index 8566270..8566270 100644
--- a/chrome/browser/resources/wrench_menu.js
+++ b/chrome/browser/resources/chromeos/wrench_menu.js