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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc

Issue 10699032: autocomplete: Extract AutocompleteResult from autocomplete.*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move comments Created 8 years, 5 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
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 "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/display_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/display/display_controller.h" 9 #include "ash/display/display_controller.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "base/bind.h"
12 #include "base/json/json_value_converter.h"
11 #include "base/logging.h" 13 #include "base/logging.h"
12 #include "base/json/json_value_converter.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "chromeos/display/output_configurator.h" 15 #include "chromeos/display/output_configurator.h"
15 #include "content/public/browser/web_ui.h" 16 #include "content/public/browser/web_ui.h"
16 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
17 #include "ui/aura/env.h" 18 #include "ui/aura/env.h"
18 #include "ui/aura/display_manager.h" 19 #include "ui/aura/display_manager.h"
19 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/gfx/display.h" 21 #include "ui/gfx/display.h"
21 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
22 23
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 DCHECK_LE(DisplayController::TOP, layout); 152 DCHECK_LE(DisplayController::TOP, layout);
152 DCHECK_GE(DisplayController::LEFT, layout); 153 DCHECK_GE(DisplayController::LEFT, layout);
153 154
154 ash::Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout( 155 ash::Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
155 static_cast<DisplayController::SecondaryDisplayLayout>(layout)); 156 static_cast<DisplayController::SecondaryDisplayLayout>(layout));
156 SendDisplayInfo(); 157 SendDisplayInfo();
157 } 158 }
158 159
159 } // namespace options2 160 } // namespace options2
160 } // namespace chromeos 161 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698