summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/compact_navigation_bar.cc (renamed from chrome/browser/views/compact_navigation_bar.cc)2
-rw-r--r--chrome/browser/chromeos/compact_navigation_bar.h (renamed from chrome/browser/views/compact_navigation_bar.h)6
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc2
3 files changed, 5 insertions, 5 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"