From 074283adf1264cebfd1272afae558d2d7366a988 Mon Sep 17 00:00:00 2001
From: "pkasting@chromium.org"
 <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 28 May 2010 23:47:59 +0000
Subject: 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
---
 chrome_frame/resources/chrome_frame_resources.grd |  4 ++--
 chrome_frame/resources/structured_resources.rc    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'chrome_frame/resources')

diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd
index a8107fd..f9d9a7f 100644
--- a/chrome_frame/resources/chrome_frame_resources.grd
+++ b/chrome_frame/resources/chrome_frame_resources.grd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- 
-Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
+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.
 -->
@@ -30,7 +30,7 @@ for localizable strings
       <include name="IDR_CHROMEPROTOCOL" file="../chrome_protocol.rgs" type="REGISTRY" />
       <include name="IDR_CHROMEACTIVEDOCUMENT" file="../chrome_active_document.rgs" 
                type="REGISTRY" />
-      <include name="IDR_CHROMEFRAME" file="../chrome_frame_activex.rgs" type="REGISTRY" />
+      <include name="IDR_CHROMEFRAME_ACTIVEX" file="../chrome_frame_activex.rgs" type="REGISTRY" />
       <include name="IDR_CHROMEFRAME_NPAPI" file="../chrome_frame_npapi.rgs" type="REGISTRY" />
     </includes>
   </release>
diff --git a/chrome_frame/resources/structured_resources.rc b/chrome_frame/resources/structured_resources.rc
index 1d07e05..28bcf9b 100644
--- a/chrome_frame/resources/structured_resources.rc
+++ b/chrome_frame/resources/structured_resources.rc
@@ -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.
 
@@ -9,8 +9,8 @@
 
 IDR_CHROME_FRAME_IE_FULL_TAB ACCELERATORS
 BEGIN
-    VK_LEFT,        IDC_BACK,                   VIRTKEY, ALT
-    VK_BACK,        IDC_BACK,                   VIRTKEY
-    VK_BACK,        IDC_FORWARD,                VIRTKEY, SHIFT
-    VK_RIGHT,       IDC_FORWARD,                VIRTKEY, ALT
+    VK_LEFT,        IDC_CHROMEFRAME_BACK,       VIRTKEY, ALT
+    VK_BACK,        IDC_CHROMEFRAME_BACK,       VIRTKEY
+    VK_BACK,        IDC_CHROMEFRAME_FORWARD,    VIRTKEY, SHIFT
+    VK_RIGHT,       IDC_CHROMEFRAME_FORWARD,    VIRTKEY, ALT
 END
-- 
cgit v1.1