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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 (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/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/number_formatting.h" 8 #include "base/i18n/number_formatting.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
1523 1523
1524 // static 1524 // static
1525 TaskManager* TaskManager::GetInstance() { 1525 TaskManager* TaskManager::GetInstance() {
1526 return Singleton<TaskManager>::get(); 1526 return Singleton<TaskManager>::get();
1527 } 1527 }
1528 1528
1529 void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) { 1529 void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) {
1530 chrome::NavigateParams params( 1530 chrome::NavigateParams params(
1531 ProfileManager::GetLastUsedProfileAllowedByPolicy(), 1531 ProfileManager::GetLastUsedProfileAllowedByPolicy(),
1532 GURL(chrome::kChromeUIMemoryURL), 1532 GURL(chrome::kChromeUIMemoryURL),
1533 content::PAGE_TRANSITION_LINK); 1533 ui::PAGE_TRANSITION_LINK);
1534 params.disposition = NEW_FOREGROUND_TAB; 1534 params.disposition = NEW_FOREGROUND_TAB;
1535 params.host_desktop_type = desktop_type; 1535 params.host_desktop_type = desktop_type;
1536 chrome::Navigate(&params); 1536 chrome::Navigate(&params);
1537 } 1537 }
1538 1538
1539 TaskManager::TaskManager() 1539 TaskManager::TaskManager()
1540 : model_(new TaskManagerModel(this)) { 1540 : model_(new TaskManagerModel(this)) {
1541 } 1541 }
1542 1542
1543 TaskManager::~TaskManager() { 1543 TaskManager::~TaskManager() {
1544 } 1544 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/typed_urls_helper.cc ('k') | chrome/browser/task_manager/task_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698