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

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: thestig's comments Created 4 years, 8 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 #include "net/url_request/url_request_context.h" 212 #include "net/url_request/url_request_context.h"
213 #include "third_party/WebKit/public/web/WebWindowFeatures.h" 213 #include "third_party/WebKit/public/web/WebWindowFeatures.h"
214 #include "ui/base/l10n/l10n_util.h" 214 #include "ui/base/l10n/l10n_util.h"
215 #include "ui/base/window_open_disposition.h" 215 #include "ui/base/window_open_disposition.h"
216 #include "ui/gfx/geometry/point.h" 216 #include "ui/gfx/geometry/point.h"
217 #include "ui/shell_dialogs/selected_file_info.h" 217 #include "ui/shell_dialogs/selected_file_info.h"
218 218
219 #if defined(OS_WIN) 219 #if defined(OS_WIN)
220 #include <windows.h> 220 #include <windows.h>
221 #include <shellapi.h> 221 #include <shellapi.h>
222 #include "chrome/browser/task_manager/task_manager.h"
223 #include "chrome/browser/ui/view_ids.h" 222 #include "chrome/browser/ui/view_ids.h"
224 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h" 223 #include "components/autofill/core/browser/autofill_ie_toolbar_import_win.h"
225 #include "ui/base/touch/touch_device.h" 224 #include "ui/base/touch/touch_device.h"
226 #include "ui/base/win/shell.h" 225 #include "ui/base/win/shell.h"
227 #endif // OS_WIN 226 #endif // OS_WIN
228 227
229 #if defined(OS_CHROMEOS) 228 #if defined(OS_CHROMEOS)
230 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 229 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
231 #endif 230 #endif
232 231
(...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
2745 if (contents && !allow_js_access) { 2744 if (contents && !allow_js_access) {
2746 contents->web_contents()->GetController().LoadURL( 2745 contents->web_contents()->GetController().LoadURL(
2747 target_url, 2746 target_url,
2748 content::Referrer(), 2747 content::Referrer(),
2749 ui::PAGE_TRANSITION_LINK, 2748 ui::PAGE_TRANSITION_LINK,
2750 std::string()); // No extra headers. 2749 std::string()); // No extra headers.
2751 } 2750 }
2752 2751
2753 return contents != NULL; 2752 return contents != NULL;
2754 } 2753 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698