Commit 91e04345 authored by avayvod@chromium.org's avatar avayvod@chromium.org

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
parent 74f44d53
......@@ -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),
......
......@@ -37,7 +37,7 @@ namespace chromeos {
// ViewsNetworkScreenActor, public:
ViewsNetworkScreenActor::ViewsNetworkScreenActor(
WizardScreenDelegate* delegate,
::WizardScreenDelegate* delegate,
Delegate* screen)
: ViewScreen<NetworkSelectionView>(
delegate,
......
......@@ -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.
......
......@@ -19,7 +19,6 @@
class PrefService;
class WizardContentsView;
class WizardScreen;
namespace chromeos {
class AccountScreen;
......
......@@ -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_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment