summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 21:38:30 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 21:38:30 +0000
commit03bb953da2a51fa35e7735ce711c1be6946312ea (patch)
treebd9fe31bd34036670ccc5247dcdba72cb9609400 /chrome/browser/cocoa
parent037d1e192cfbad001946fe026d0460e636fa8e76 (diff)
downloadchromium_src-03bb953da2a51fa35e7735ce711c1be6946312ea.zip
chromium_src-03bb953da2a51fa35e7735ce711c1be6946312ea.tar.gz
chromium_src-03bb953da2a51fa35e7735ce711c1be6946312ea.tar.bz2
Bunch of match preview tweaks:
. Makes MatchPreview owned by Browser rather than each TabContents. . Makes MatchPreview dismiss when the omnibox closes. . Supports the ability to send script to the page rather than reloading on every keystroke. . Supports receiving results from the page that drives the suggest text in the omnbox. BUG=54833 TEST=none Review URL: http://codereview.chromium.org/3332022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.h2
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.mm10
-rw-r--r--chrome/browser/cocoa/location_bar/location_bar_view_mac.h1
-rw-r--r--chrome/browser/cocoa/location_bar/location_bar_view_mac.mm5
4 files changed, 18 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h
index 10b9fd3..226e573 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/cocoa/browser_window_cocoa.h
@@ -106,6 +106,8 @@ class BrowserWindowCocoa : public BrowserWindow,
virtual void Paste();
virtual void ToggleTabStripMode();
virtual void OpenTabpose();
+ virtual void ShowMatchPreview();
+ virtual void HideMatchPreview();
// Overridden from NotificationObserver
virtual void Observe(NotificationType type,
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index fa9d6c6..f889a3c 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -564,6 +564,16 @@ void BrowserWindowCocoa::OpenTabpose() {
[controller_ openTabpose];
}
+void BrowserWindowCocoa::ShowMatchPreview() {
+ // TODO: implement me
+ NOTIMPLEMENTED();
+}
+
+void BrowserWindowCocoa::HideMatchPreview() {
+ // TODO: implement me
+ NOTIMPLEMENTED();
+}
+
void BrowserWindowCocoa::Observe(NotificationType type,
const NotificationSource& source,
const NotificationDetails& details) {
diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
index 6a7a598..0ec9058 100644
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
@@ -54,6 +54,7 @@ class LocationBarViewMac : public AutocompleteEditController,
// Overridden from LocationBar:
virtual void ShowFirstRunBubble(FirstRun::BubbleType bubble_type);
+ virtual void SetSuggestedText(const string16& text);
virtual std::wstring GetInputString() const;
virtual WindowOpenDisposition GetWindowOpenDisposition() const;
virtual PageTransition::Type GetPageTransition() const;
diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
index 9bc4d1d..d8b8b80 100644
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
@@ -124,6 +124,11 @@ std::wstring LocationBarViewMac::GetInputString() const {
return location_input_;
}
+void LocationBarViewMac::SetSuggestedText(const string16& text) {
+ // TODO: implement me.
+ NOTIMPLEMENTED();
+}
+
WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
return disposition_;
}