Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Side by Side Diff: ash/display/display_manager.cc

Issue 12473004: src/: Update the remaining include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/test/display_manager_test_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/display/display_controller.h" 11 #include "ash/display/display_controller.h"
12 #include "ash/host/root_window_host_factory.h" 12 #include "ash/host/root_window_host_factory.h"
13 #include "ash/screen_ash.h" 13 #include "ash/screen_ash.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
19 #include "base/string_split.h"
20 #include "base/stringprintf.h" 19 #include "base/stringprintf.h"
20 #include "base/strings/string_split.h"
21 #include "base/utf_string_conversions.h" 21 #include "base/utf_string_conversions.h"
22 #include "grit/ash_strings.h" 22 #include "grit/ash_strings.h"
23 #include "ui/aura/client/screen_position_client.h" 23 #include "ui/aura/client/screen_position_client.h"
24 #include "ui/aura/env.h" 24 #include "ui/aura/env.h"
25 #include "ui/aura/root_window.h" 25 #include "ui/aura/root_window.h"
26 #include "ui/aura/root_window_host.h" 26 #include "ui/aura/root_window_host.h"
27 #include "ui/aura/window_property.h" 27 #include "ui/aura/window_property.h"
28 #include "ui/base/l10n/l10n_util.h" 28 #include "ui/base/l10n/l10n_util.h"
29 #include "ui/gfx/display.h" 29 #include "ui/gfx/display.h"
30 #include "ui/gfx/rect.h" 30 #include "ui/gfx/rect.h"
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 // to change there. 587 // to change there.
588 if (DisplayController::HasPrimaryDisplay() && 588 if (DisplayController::HasPrimaryDisplay() &&
589 display_info.id() == DisplayController::GetPrimaryDisplay().id()) { 589 display_info.id() == DisplayController::GetPrimaryDisplay().id()) {
590 new_display.set_bounds(gfx::Rect(new_display.bounds().size())); 590 new_display.set_bounds(gfx::Rect(new_display.bounds().size()));
591 } 591 }
592 return new_display; 592 return new_display;
593 } 593 }
594 594
595 } // namespace internal 595 } // namespace internal
596 } // namespace ash 596 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/display_manager_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698