Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/ui/views/ash/launcher/chrome_launcher_delegate.h" | 5 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher_model.h" | 7 #include "ash/launcher/launcher_model.h" |
| 8 #include "ash/launcher/launcher_types.h" | 8 #include "ash/launcher/launcher_types.h" |
| 9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 511 if (current->second.app_id == app_id && current->second.pinned) | 511 if (current->second.app_id == app_id && current->second.pinned) |
| 512 Unpin(current->first); | 512 Unpin(current->first); |
| 513 } | 513 } |
| 514 } | 514 } |
| 515 | 515 |
| 516 void ChromeLauncherDelegate::SetAppIconLoaderForTest(AppIconLoader* loader) { | 516 void ChromeLauncherDelegate::SetAppIconLoaderForTest(AppIconLoader* loader) { |
| 517 app_icon_loader_.reset(loader); | 517 app_icon_loader_.reset(loader); |
| 518 } | 518 } |
| 519 | 519 |
| 520 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() { | 520 Profile* ChromeLauncherDelegate::GetProfileForNewWindows() { |
| 521 Profile* profile = ProfileManager::GetDefaultProfile(); | 521 Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
| 522 if (browser_defaults::kAlwaysOpenIncognitoWindow && | 522 if (browser_defaults::kAlwaysOpenIncognitoWindow && |
|
sky
2012/03/19 15:29:28
Do we need 522-526 anymore? Isn't it now covered b
Jun Mukai
2012/03/20 04:36:08
Removed.
| |
| 523 IncognitoModePrefs::ShouldLaunchIncognito( | 523 IncognitoModePrefs::ShouldLaunchIncognito( |
| 524 *CommandLine::ForCurrentProcess(), | 524 *CommandLine::ForCurrentProcess(), |
| 525 profile->GetPrefs())) { | 525 profile->GetPrefs())) { |
| 526 profile = profile->GetOffTheRecordProfile(); | 526 profile = profile->GetOffTheRecordProfile(); |
| 527 } | 527 } |
| 528 return profile; | 528 return profile; |
| 529 } | 529 } |
| OLD | NEW |