diff options
| author | simon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 22:37:42 +0000 |
|---|---|---|
| committer | simon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 22:37:42 +0000 |
| commit | 68c7630b3ae6738e5b9ebb1998b3184fa930463c (patch) | |
| tree | 6e2e9db98e7d0149f85e315c2668146b4aa42100 /chrome/browser/ui/webui/conflicts_ui.h | |
| parent | bc2eeb4a236eab44d172d4737d16c9c237db4210 (diff) | |
| download | chromium_src-68c7630b3ae6738e5b9ebb1998b3184fa930463c.zip chromium_src-68c7630b3ae6738e5b9ebb1998b3184fa930463c.tar.gz chromium_src-68c7630b3ae6738e5b9ebb1998b3184fa930463c.tar.bz2 | |
Move RefCountedMemory Class to Base namespace
BUG=none
TEST=compiles chrome, browser_tests and ui_tests
Review URL: http://codereview.chromium.org/10272004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/conflicts_ui.h')
| -rw-r--r-- | chrome/browser/ui/webui/conflicts_ui.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index 8a402ae..0b243ac 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h @@ -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. @@ -10,14 +10,16 @@ #if defined(OS_WIN) +namespace base { class RefCountedMemory; +} // The Web UI handler for about:conflicts. class ConflictsUI : public content::WebUIController { public: explicit ConflictsUI(content::WebUI* web_ui); - static RefCountedMemory* GetFaviconResourceBytes(); + static base::RefCountedMemory* GetFaviconResourceBytes(); private: DISALLOW_COPY_AND_ASSIGN(ConflictsUI); |