| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| index 77c0344a612642f52a1fa09402f3ed0e7c3efca9..29d93710b79b39b576ed0d3cddcdaae98a19ade3 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
|
| @@ -662,7 +662,7 @@ scoped_ptr<TestBrowserWindowAura> CreateTestBrowserWindow(
|
| // Create a window.
|
| aura::Window* window = new aura::Window(NULL);
|
| window->set_id(0);
|
| - window->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| + window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
|
| window->Init(ui::LAYER_TEXTURED);
|
| window->Show();
|
|
|
| @@ -728,7 +728,7 @@ class V1App : public TestBrowserWindow {
|
| // Create a window.
|
| native_window_.reset(new aura::Window(NULL));
|
| native_window_->set_id(0);
|
| - native_window_->SetType(aura::client::WINDOW_TYPE_POPUP);
|
| + native_window_->SetType(ui::wm::WINDOW_TYPE_POPUP);
|
| native_window_->Init(ui::LAYER_TEXTURED);
|
| native_window_->Show();
|
|
|
|
|