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

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

Issue 1912773002: Remove the old task manager view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 years, 7 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 #include "net/url_request/url_request_context.h" 210 #include "net/url_request/url_request_context.h"
211 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 211 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
212 #include "ui/base/l10n/l10n_util.h" 212 #include "ui/base/l10n/l10n_util.h"
213 #include "ui/base/window_open_disposition.h" 213 #include "ui/base/window_open_disposition.h"
214 #include "ui/gfx/geometry/point.h" 214 #include "ui/gfx/geometry/point.h"
215 #include "ui/shell_dialogs/selected_file_info.h" 215 #include "ui/shell_dialogs/selected_file_info.h"
216 216
217 #if defined(OS_WIN) 217 #if defined(OS_WIN)
218 #include <windows.h> 218 #include <windows.h>
219 #include <shellapi.h> 219 #include <shellapi.h>
220 #include "chrome/browser/task_manager/task_manager.h"
221 #include "chrome/browser/ui/view_ids.h" 220 #include "chrome/browser/ui/view_ids.h"
222 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 221 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
223 #include "ui/base/touch/touch_device.h" 222 #include "ui/base/touch/touch_device.h"
224 #include "ui/base/win/shell.h" 223 #include "ui/base/win/shell.h"
225 #endif // OS_WIN 224 #endif // OS_WIN
226 225
227 #if defined(OS_CHROMEOS) 226 #if defined(OS_CHROMEOS)
228 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 227 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
229 #endif 228 #endif
230 229
(...skipping 2371 matching lines...) Expand 10 before | Expand all | Expand 10 after
2602 if (contents && !allow_js_access) { 2601 if (contents && !allow_js_access) {
2603 contents->web_contents()->GetController().LoadURL( 2602 contents->web_contents()->GetController().LoadURL(
2604 target_url, 2603 target_url,
2605 content::Referrer(), 2604 content::Referrer(),
2606 ui::PAGE_TRANSITION_LINK, 2605 ui::PAGE_TRANSITION_LINK,
2607 std::string()); // No extra headers. 2606 std::string()); // No extra headers.
2608 } 2607 }
2609 2608
2610 return contents != NULL; 2609 return contents != NULL;
2611 } 2610 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_tester_nonmac.cc ('k') | chrome/browser/ui/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698