| Index: athena/screen/background_controller.h
|
| diff --git a/athena/screen/background_controller.h b/athena/screen/background_controller.h
|
| index cdc0d358fb2dbe372207599d1d3c1545fca2d41f..2cade5e4589e9797c448df4d83d56d08f2c79fd8 100644
|
| --- a/athena/screen/background_controller.h
|
| +++ b/athena/screen/background_controller.h
|
| @@ -21,7 +21,10 @@ class BackgroundView;
|
| // Controls background image switching.
|
| class BackgroundController {
|
| public:
|
| - explicit BackgroundController(aura::Window* container);
|
| + // |popup_container| is the parent window to use for the "select network"
|
| + // dialog.
|
| + BackgroundController(aura::Window* background_container,
|
| + aura::Window* popup_container);
|
| ~BackgroundController();
|
|
|
| void SetImage(const gfx::ImageSkia& image);
|
| @@ -31,6 +34,7 @@ class BackgroundController {
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BackgroundController);
|
| };
|
| -}
|
| +
|
| +} // namespace athena
|
|
|
| #endif // ATHENA_SCREEN_BACKGROUND_CONTROLLER_H_
|
|
|