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

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

Issue 2074213002: mash: Move ash_switches.* to ash/common; cleanup DEPS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken relative include. Created 4 years, 6 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 222 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
223 #include "ui/base/touch/touch_device.h" 223 #include "ui/base/touch/touch_device.h"
224 #include "ui/base/win/shell.h" 224 #include "ui/base/win/shell.h"
225 #endif // OS_WIN 225 #endif // OS_WIN
226 226
227 #if defined(OS_CHROMEOS) 227 #if defined(OS_CHROMEOS)
228 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 228 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
229 #endif 229 #endif
230 230
231 #if defined(USE_ASH) 231 #if defined(USE_ASH)
232 #include "ash/ash_switches.h" 232 #include "ash/common/ash_switches.h"
233 #include "ash/shell.h" 233 #include "ash/shell.h"
234 #endif 234 #endif
235 235
236 using base::TimeDelta; 236 using base::TimeDelta;
237 using base::UserMetricsAction; 237 using base::UserMetricsAction;
238 using content::NativeWebKeyboardEvent; 238 using content::NativeWebKeyboardEvent;
239 using content::NavigationController; 239 using content::NavigationController;
240 using content::NavigationEntry; 240 using content::NavigationEntry;
241 using content::OpenURLParams; 241 using content::OpenURLParams;
242 using content::PluginService; 242 using content::PluginService;
(...skipping 2355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2598 if (contents && !allow_js_access) { 2598 if (contents && !allow_js_access) {
2599 contents->web_contents()->GetController().LoadURL( 2599 contents->web_contents()->GetController().LoadURL(
2600 target_url, 2600 target_url,
2601 content::Referrer(), 2601 content::Referrer(),
2602 ui::PAGE_TRANSITION_LINK, 2602 ui::PAGE_TRANSITION_LINK,
2603 std::string()); // No extra headers. 2603 std::string()); // No extra headers.
2604 } 2604 }
2605 2605
2606 return contents != NULL; 2606 return contents != NULL;
2607 } 2607 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698