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

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 220 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
221 #include "ui/base/touch/touch_device.h" 221 #include "ui/base/touch/touch_device.h"
222 #include "ui/base/win/shell.h" 222 #include "ui/base/win/shell.h"
223 #endif // OS_WIN 223 #endif // OS_WIN
224 224
225 #if defined(OS_CHROMEOS) 225 #if defined(OS_CHROMEOS)
226 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 226 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
227 #endif 227 #endif
228 228
229 #if defined(USE_ASH) 229 #if defined(USE_ASH)
230 #include "ash/common/ash_switches.h" // nogncheck
231 #include "ash/shell.h" // nogncheck 230 #include "ash/shell.h" // nogncheck
232 #endif 231 #endif
233 232
234 using base::TimeDelta; 233 using base::TimeDelta;
235 using base::UserMetricsAction; 234 using base::UserMetricsAction;
236 using content::NativeWebKeyboardEvent; 235 using content::NativeWebKeyboardEvent;
237 using content::NavigationController; 236 using content::NavigationController;
238 using content::NavigationEntry; 237 using content::NavigationEntry;
239 using content::OpenURLParams; 238 using content::OpenURLParams;
240 using content::PluginService; 239 using content::PluginService;
(...skipping 2324 matching lines...) Expand 10 before | Expand all | Expand 10 after
2565 if (contents && !allow_js_access) { 2564 if (contents && !allow_js_access) {
2566 contents->web_contents()->GetController().LoadURL( 2565 contents->web_contents()->GetController().LoadURL(
2567 target_url, 2566 target_url,
2568 content::Referrer(), 2567 content::Referrer(),
2569 ui::PAGE_TRANSITION_LINK, 2568 ui::PAGE_TRANSITION_LINK,
2570 std::string()); // No extra headers. 2569 std::string()); // No extra headers.
2571 } 2570 }
2572 2571
2573 return contents != NULL; 2572 return contents != NULL;
2574 } 2573 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698