Clang build fix

BUG=None
TEST=Compile with clang.
TBR=altimofeev@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86611 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 45c80bc..8cf147a 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -36,7 +36,7 @@ namespace chromeos {
 ///////////////////////////////////////////////////////////////////////////////
 // NetworkScreen, public:
 
-NetworkScreen::NetworkScreen(WizardScreenDelegate* delegate)
+NetworkScreen::NetworkScreen(::WizardScreenDelegate* delegate)
     : WizardScreen(delegate),
       is_network_subscribed_(false),
       continue_pressed_(false),
diff --git a/chrome/browser/chromeos/login/views_network_screen_actor.cc b/chrome/browser/chromeos/login/views_network_screen_actor.cc
index 10307a0..d69b909 100644
--- a/chrome/browser/chromeos/login/views_network_screen_actor.cc
+++ b/chrome/browser/chromeos/login/views_network_screen_actor.cc
@@ -37,7 +37,7 @@ namespace chromeos {
 // ViewsNetworkScreenActor, public:
 
 ViewsNetworkScreenActor::ViewsNetworkScreenActor(
-    WizardScreenDelegate* delegate,
+    ::WizardScreenDelegate* delegate,
     Delegate* screen)
     : ViewScreen<NetworkSelectionView>(
         delegate,
diff --git a/chrome/browser/chromeos/login/views_network_screen_actor.h b/chrome/browser/chromeos/login/views_network_screen_actor.h
index 8d936e6..d1b6ced 100644
--- a/chrome/browser/chromeos/login/views_network_screen_actor.h
+++ b/chrome/browser/chromeos/login/views_network_screen_actor.h
@@ -20,10 +20,11 @@
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "views/controls/button/button.h"
 
+class WizardScreenDelegate;
+
 namespace chromeos {
 
 class HelpAppLauncher;
-class WizardScreenDelegate;
 
 // Views-specific implementation of NetworkScreenActor. Hosts
 // NetworkSelectionView.
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index fac5554..b2f14a1 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -19,7 +19,6 @@
 
 class PrefService;
 class WizardContentsView;
-class WizardScreen;
 
 namespace chromeos {
 class AccountScreen;
diff --git a/chrome/browser/chromeos/login/wizard_screen.h b/chrome/browser/chromeos/login/wizard_screen.h
index 0d58254..75892b6 100644
--- a/chrome/browser/chromeos/login/wizard_screen.h
+++ b/chrome/browser/chromeos/login/wizard_screen.h
@@ -14,8 +14,9 @@ class View;
 }  // namespace views
 
 namespace chromeos {
-
 class ScreenObserver;
+}  // namespace chromeos
+
 class WizardScreen;
 
 // Interface that login wizard exposes to its screens.
@@ -25,7 +26,7 @@ class WizardScreenDelegate {
   virtual views::View* GetWizardView() = 0;
 
   // Returns observer screen should notify.
-  virtual ScreenObserver* GetObserver(WizardScreen* screen) = 0;
+  virtual chromeos::ScreenObserver* GetObserver(WizardScreen* screen) = 0;
 
   // Forces the current screen to be shown immediately.
   virtual void ShowCurrentScreen() = 0;
@@ -55,10 +56,4 @@ class WizardScreen {
   WizardScreenDelegate* delegate_;
 };
 
-}  // namespace chromeos
-
-// TODO(avayvod): Fix all places where namespace is not used.
-using chromeos::WizardScreenDelegate;
-using chromeos::WizardScreen;
-
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_SCREEN_H_