diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-11 20:21:32 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-11 20:21:32 +0000 |
commit | 010ea08a647dfdc4c75aaab2fca65128f50f2379 (patch) | |
tree | 6cd61817ffebd7d50fa55e5654dd967a3c69617e /tools | |
parent | b44dbd15aeb4dbe7a5be36f7f5c55e6cddf0bac9 (diff) | |
download | chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.zip chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.tar.gz chromium_src-010ea08a647dfdc4c75aaab2fca65128f50f2379.tar.bz2 |
Move native_widget_types and gtk_native_view_id_manager from base/gfx to
app/gfx in preparation for removing the base_gfx project. This also moves
base/window_impl.cc to app/win/window_impl because this file shouldn't be in
base.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/273017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r-- | tools/memory_watcher/DEPS | 3 | ||||
-rw-r--r-- | tools/memory_watcher/hotkey.h | 6 | ||||
-rw-r--r-- | tools/memory_watcher/memory_watcher.gyp | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/memory_watcher/DEPS b/tools/memory_watcher/DEPS new file mode 100644 index 0000000..0d72e09 --- /dev/null +++ b/tools/memory_watcher/DEPS @@ -0,0 +1,3 @@ +include_rules = [ + "+app", +] diff --git a/tools/memory_watcher/hotkey.h b/tools/memory_watcher/hotkey.h index ef09e48..c0d0938 100644 --- a/tools/memory_watcher/hotkey.h +++ b/tools/memory_watcher/hotkey.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -6,11 +6,11 @@ #define TOOLS_MEMORY_WATCHER_HOTKEY_H_ #include "base/gfx/rect.h" -#include "base/window_impl.h" +#include "app/win/window_impl.h" // HotKey handler. // Programs wishing to register a hotkey can use this. -class HotKeyHandler : public base::WindowImpl { +class HotKeyHandler : public app::WindowImpl { public: HotKeyHandler(UINT modifiers, UINT vk) : modifiers_(modifiers), diff --git a/tools/memory_watcher/memory_watcher.gyp b/tools/memory_watcher/memory_watcher.gyp index 2b38103..04e96a0 100644 --- a/tools/memory_watcher/memory_watcher.gyp +++ b/tools/memory_watcher/memory_watcher.gyp @@ -9,6 +9,7 @@ 'type': 'shared_library', 'msvs_guid': '3BD81303-4E14-4559-AA69-B30C3BAB08DD', 'dependencies': [ + '../../app/app.gyp:*', '../../base/base.gyp:base', '../../base/base.gyp:base_gfx', ], |