| Index: trunk/src/ash/display/display_change_observer_x11.cc
|
| ===================================================================
|
| --- trunk/src/ash/display/display_change_observer_x11.cc (revision 206508)
|
| +++ trunk/src/ash/display/display_change_observer_x11.cc (working copy)
|
| @@ -17,7 +17,7 @@
|
| #include "ash/display/display_manager.h"
|
| #include "ash/shell.h"
|
| #include "base/command_line.h"
|
| -#include "base/message_loop/message_pump_aurax11.h"
|
| +#include "base/message_pump_aurax11.h"
|
| #include "chromeos/display/output_util.h"
|
| #include "grit/ash_strings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| Property changes on: trunk/src/ash/display/display_change_observer_x11.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|