diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 12:05:29 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-27 12:05:29 +0000 |
| commit | 0477e8e68f2e3e28ca6c19a6edfb3e746b6df82d (patch) | |
| tree | 58dec49248621dfa006b893f26466c574b44bfda /chrome | |
| parent | 7df1dadbe3d3ccc97bc57ff35a2c1e9764ccc83c (diff) | |
| download | chromium_src-0477e8e68f2e3e28ca6c19a6edfb3e746b6df82d.zip chromium_src-0477e8e68f2e3e28ca6c19a6edfb3e746b6df82d.tar.gz chromium_src-0477e8e68f2e3e28ca6c19a6edfb3e746b6df82d.tar.bz2 | |
ash: Start moving window_util.h functions into wm namespace.
BUG=115846
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9455085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider_aura.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/platform_util_aura.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/automation/testing_automation_provider_aura.cc b/chrome/browser/automation/testing_automation_provider_aura.cc index fb6462c..a1a26da 100644 --- a/chrome/browser/automation/testing_automation_provider_aura.cc +++ b/chrome/browser/automation/testing_automation_provider_aura.cc @@ -14,7 +14,7 @@ void TestingAutomationProvider::ActivateWindow(int handle) { aura::Window* window = window_tracker_->GetResource(handle); if (window) { - ash::ActivateWindow(window); + ash::wm::ActivateWindow(window); } } diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc index d2cb2bf..0bafa3a 100644 --- a/chrome/browser/platform_util_aura.cc +++ b/chrome/browser/platform_util_aura.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,11 +19,11 @@ gfx::NativeView GetParent(gfx::NativeView view) { } bool IsWindowActive(gfx::NativeWindow window) { - return ash::IsActiveWindow(window); + return ash::wm::IsActiveWindow(window); } void ActivateWindow(gfx::NativeWindow window) { - ash::ActivateWindow(window); + ash::wm::ActivateWindow(window); } bool IsVisible(gfx::NativeView view) { diff --git a/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc b/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc index 1729d51..625452e 100644 --- a/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc +++ b/chrome/browser/ui/views/aura/launcher/chrome_launcher_delegate.cc @@ -15,9 +15,9 @@ #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -284,7 +284,7 @@ void ChromeLauncherDelegate::Open(ash::LauncherID id) { LauncherUpdater* updater = id_to_item_map_[id].updater; if (updater) { updater->window()->Show(); - ash::ActivateWindow(updater->window()); + ash::wm::ActivateWindow(updater->window()); TabContentsWrapper* tab = updater->GetTab(id); if (tab) { updater->tab_model()->ActivateTabAt( |