diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:43:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-12 23:43:50 +0000 |
| commit | 97eb75a026e1b4c0b919b68e78093e639aac0d7b (patch) | |
| tree | a8a97010a38c6b718b554b23018a502ddd04eb19 /chrome/browser/policy | |
| parent | b7f6916987b3562cbc685af95030e29e588738d9 (diff) | |
| download | chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.zip chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.tar.gz chromium_src-97eb75a026e1b4c0b919b68e78093e639aac0d7b.tar.bz2 | |
Rename CurrentBrowserContext to ActiveBrowserContext
Remove use of GetDefaultProfileXXX in
- c/b/ui/ash/chrome_shell_delegate*
- c/b/ui/ash/keyboard_controller_proxy.cc
- c/b/ui/ash/screenshot_taker.cc
BUG=322682
Review URL: https://codereview.chromium.org/112153002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/policy_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 80cc1c8..fbc3f7c0 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -141,9 +141,9 @@ #include "ash/accelerators/accelerator_table.h" #include "ash/magnifier/magnifier_constants.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/magnification_manager.h" +#include "chrome/browser/profiles/profile_manager.h" #include "chromeos/audio/cras_audio_handler.h" #endif @@ -337,7 +337,7 @@ void DownloadAndVerifyFile( int CountScreenshots() { DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext( - ash::Shell::GetInstance()->delegate()->GetCurrentBrowserContext()); + ProfileManager::GetActiveUserProfileOrOffTheRecord()); base::FileEnumerator enumerator(download_prefs->DownloadPath(), false, base::FileEnumerator::FILES, "Screenshot*"); |