summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.h
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:47:59 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:47:59 +0000
commit074283adf1264cebfd1272afae558d2d7366a988 (patch)
tree8271a7e86446529c9f0927b5cb171690861c8f26 /chrome_frame/chrome_active_document.h
parentf22a79585707eef6ef87672e8b89845122108052 (diff)
downloadchromium_src-074283adf1264cebfd1272afae558d2d7366a988.zip
chromium_src-074283adf1264cebfd1272afae558d2d7366a988.tar.gz
chromium_src-074283adf1264cebfd1272afae558d2d7366a988.tar.bz2
Simplify Chrome Frame usage of Chrome identifiers by simply using the Chrome identifiers directly. This required renaming a few identifiers to avoid macro renaming conflicts when including the Chrome headers.
BUG=none TEST=none Review URL: http://codereview.chromium.org/2359002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.h')
-rw-r--r--chrome_frame/chrome_active_document.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 575c06a..bd1474f 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -232,8 +232,8 @@ END_COM_MAP()
BEGIN_MSG_MAP(ChromeActiveDocument)
MESSAGE_HANDLER(WM_FIRE_PRIVACY_CHANGE_NOTIFICATION, OnFirePrivacyChange)
- COMMAND_ID_HANDLER(IDC_FORWARD, OnForward)
- COMMAND_ID_HANDLER(IDC_BACK, OnBack)
+ COMMAND_ID_HANDLER(IDC_CHROMEFRAME_FORWARD, OnForward)
+ COMMAND_ID_HANDLER(IDC_CHROMEFRAME_BACK, OnBack)
CHAIN_MSG_MAP(BaseActiveX)
END_MSG_MAP()