summaryrefslogtreecommitdiffstats
path: root/chrome/browser/instant/instant_confirm_dialog.cc
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-11-18 18:32:45 +0000
committerBen Murdoch <benm@google.com>2010-11-18 18:38:07 +0000
commit513209b27ff55e2841eac0e4120199c23acce758 (patch)
treeaeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/instant/instant_confirm_dialog.cc
parent164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff)
downloadexternal_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz
external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/instant/instant_confirm_dialog.cc')
-rw-r--r--chrome/browser/instant/instant_confirm_dialog.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc
index ad7a396..5c6c535 100644
--- a/chrome/browser/instant/instant_confirm_dialog.cc
+++ b/chrome/browser/instant/instant_confirm_dialog.cc
@@ -27,7 +27,7 @@ void ShowInstantConfirmDialogIfNecessary(gfx::NativeWindow parent,
ShowInstantConfirmDialog(parent, profile);
}
-#if !defined(TOOLKIT_VIEWS)
+#if !defined(TOOLKIT_VIEWS) && !defined(TOOLKIT_GTK)
void ShowInstantConfirmDialog(gfx::NativeWindow parent,
Profile* profile) {
NOTIMPLEMENTED();