summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 21:51:13 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 21:51:13 +0000
commit228ebc6019598854abcc7b88d59ac271620718bf (patch)
tree69f414572981a043b1c400254ad9c8571b76499d /ui
parent8e082ce4418d69e8631a5159d162f474c93ec447 (diff)
downloadchromium_src-228ebc6019598854abcc7b88d59ac271620718bf.zip
chromium_src-228ebc6019598854abcc7b88d59ac271620718bf.tar.gz
chromium_src-228ebc6019598854abcc7b88d59ac271620718bf.tar.bz2
Fix build breakage.
R=ben@chromium.org,eroman@chromium.org TBR=ben@chromium.org,eroman@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/7904028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/models/simple_menu_model.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
index e155e21..39a732f 100644
--- a/ui/base/models/simple_menu_model.cc
+++ b/ui/base/models/simple_menu_model.cc
@@ -32,8 +32,8 @@ MSVC_PUSH_DISABLE_WARNING(4748)
}
#if defined(COMPILER_MSVC)
-#pragma optimize("", off)
-MSVC_PUSH_DISABLE_WARNING(4748)
+MSVC_POP_WARNING()
+#pragma optimize("", on)
#endif
int command_id;