4 files changed, 11 insertions, 15 deletions
diff --git a/chrome/browser/views/compact_navigation_bar.cc b/chrome/browser/chromeos/compact_navigation_bar.cc
index 7feb27b..e2be4a0 100644
--- a/chrome/browser/views/compact_navigation_bar.cc
+++ b/chrome/browser/chromeos/compact_navigation_bar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/views/compact_navigation_bar.h"
+#include "chrome/browser/chromeos/compact_navigation_bar.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
diff --git a/chrome/browser/views/compact_navigation_bar.h b/chrome/browser/chromeos/compact_navigation_bar.h
index ba7286b..f086f34 100644
--- a/chrome/browser/views/compact_navigation_bar.h
+++ b/chrome/browser/chromeos/compact_navigation_bar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VIEWS_COMPACT_NAVIGATION_BAR_H_
-#define CHROME_BROWSER_VIEWS_COMPACT_NAVIGATION_BAR_H_
+#ifndef CHROME_BROWSER_CHROMEOS_COMPACT_NAVIGATION_BAR_H_
+#define CHROME_BROWSER_CHROMEOS_COMPACT_NAVIGATION_BAR_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
@@ -75,4 +75,4 @@ class CompactNavigationBar : public views::View,
   DISALLOW_COPY_AND_ASSIGN(CompactNavigationBar);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_COMPACT_NAVIGATION_BAR_H_
+#endif  // CHROME_BROWSER_CHROMEOS_COMPACT_NAVIGATION_BAR_H_
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 54dc79a..2c559ca 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -72,8 +72,8 @@
 #include "skia/ext/skia_utils.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/compact_navigation_bar.h"
 #include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/views/compact_navigation_bar.h"
 #include "chrome/browser/views/frame/status_area_view.h"
 #include "chrome/browser/views/panel_controller.h"
 #include "chrome/browser/views/tabs/tab_overview_types.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 99c9a0a..207988c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -800,6 +800,8 @@
         'browser/chrome_plugin_host.h',
         'browser/chrome_thread.cc',
         'browser/chrome_thread.h',
+        'browser/chromeos/compact_navigation_bar.cc',
+        'browser/chromeos/compact_navigation_bar.h',
         'browser/chromeos/pipe_reader.cc',
         'browser/chromeos/pipe_reader.h',
         'browser/chromeos/external_cookie_handler.cc',
@@ -1845,8 +1847,6 @@
         'browser/views/chrome_views_delegate.h',
         'browser/views/clear_browsing_data.cc',
         'browser/views/clear_browsing_data.h',
-        'browser/views/compact_navigation_bar.cc',
-        'browser/views/compact_navigation_bar.h',
         'browser/views/constrained_window_win.cc',
         'browser/views/constrained_window_win.h',
         'browser/views/confirm_message_box_dialog.cc',
@@ -2087,11 +2087,8 @@
           ],
         }],
         ['chromeos==0', {
-          'sources!': [
-            'browser/chromeos/pipe_reader.cc',
-            'browser/chromeos/pipe_reader.h',
-            'browser/chromeos/external_cookie_handler.cc',
-            'browser/chromeos/external_cookie_handler.h',
+          'sources/': [
+            ['exclude', '^browser/chromeos'],
           ],
         }],
         ['OS=="linux"', {
@@ -4127,9 +4124,8 @@
       ],
       'conditions': [
         ['chromeos==0', {
-          'sources!': [
-            'browser/chromeos/pipe_reader_unittest.cc',
-            'browser/chromeos/external_cookie_handler_unittest.cc',
+          'sources/': [
+            ['exclude', '^browser/chromeos'],
           ],
         }],
         ['OS=="linux"', {