Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1646)

Unified Diff: chrome/browser/gtk/browser_window_gtk.h

Issue 341044: Move chromeos code to namespace chromeos. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 2 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
Index: chrome/browser/gtk/browser_window_gtk.h
===================================================================
--- chrome/browser/gtk/browser_window_gtk.h (revision 30488)
+++ chrome/browser/gtk/browser_window_gtk.h (working copy)
@@ -21,8 +21,11 @@
#include "chrome/common/x11_util.h"
#ifdef OS_CHROMEOS
+namespace chromeos {
class CompactNavigationBar;
+class PanelController;
class StatusAreaView;
+}
#endif
class BookmarkBarGtk;
@@ -38,10 +41,6 @@
class TabContentsContainerGtk;
class TabStripGtk;
-#ifdef OS_CHROMEOS
-class PanelController;
-#endif
-
// An implementation of BrowserWindow for GTK.
// Cross-platform code will interact with this object when
// it needs to manipulate the window.
@@ -385,10 +384,10 @@
// True if a drag is active. See description above setter for details.
bool drag_active_;
// Controls interactions with the window manager for popup panels.
- PanelController* panel_controller_;
+ chromeos::PanelController* panel_controller_;
- CompactNavigationBar* compact_navigation_bar_;
- StatusAreaView* status_area_;
+ chromeos::CompactNavigationBar* compact_navigation_bar_;
+ chromeos::StatusAreaView* status_area_;
// The MainMenu button.
CustomDrawButton* main_menu_button_;

Powered by Google App Engine
This is Rietveld 408576698