summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/views')
-rw-r--r--chrome/browser/ui/views/ash/chrome_shell_delegate.cc32
-rw-r--r--chrome/browser/ui/views/ash/chrome_shell_delegate.h1
2 files changed, 0 insertions, 33 deletions
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index cf68170..33d092d 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -17,7 +17,6 @@
#include "chrome/browser/sessions/tab_restore_service_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/ash/app_list/app_list_view_delegate.h"
#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/views/ash/user_action_handler.h"
@@ -132,37 +131,6 @@ void ChromeShellDelegate::NewWindow(bool is_incognito) {
is_incognito ? profile->GetOffTheRecordProfile() : profile);
}
-void ChromeShellDelegate::Search() {
- // Exit fullscreen to show omnibox.
- Browser* last_active = BrowserList::GetLastActive();
- if (last_active) {
- if (last_active->window()->IsFullscreen()) {
- last_active->ToggleFullscreenMode();
- // ToggleFullscreenMode is asynchronous, so we don't have omnibox
- // visible at this point. Wait for next event cycle which toggles
- // the visibility of omnibox before creating new tab.
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(&ChromeShellDelegate::Search,
- weak_factory_.GetWeakPtr()));
- return;
- }
- }
-
- Browser* target_browser = browser::FindOrCreateTabbedBrowser(
- last_active ? last_active->profile() :
- ProfileManager::GetDefaultProfileOrOffTheRecord());
- const GURL& url = target_browser->GetSelectedWebContents() ?
- target_browser->GetSelectedWebContents()->GetURL() : GURL();
- if (url.SchemeIs(chrome::kChromeUIScheme) &&
- url.host() == chrome::kChromeUINewTabHost) {
- // If the NTP is showing, focus the omnibox.
- target_browser->window()->SetFocusToLocationBar(true);
- } else {
- target_browser->NewTab();
- }
- target_browser->window()->Show();
-}
-
void ChromeShellDelegate::OpenFileManager() {
#if defined(OS_CHROMEOS)
file_manager_util::OpenApplication();
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.h b/chrome/browser/ui/views/ash/chrome_shell_delegate.h
index 8d1c9a5..60cd2e1 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.h
@@ -39,7 +39,6 @@ class ChromeShellDelegate : public ash::ShellDelegate,
virtual void Exit() OVERRIDE;
virtual void NewTab() OVERRIDE;
virtual void NewWindow(bool is_incognito) OVERRIDE;
- virtual void Search() OVERRIDE;
virtual void OpenFileManager() OVERRIDE;
virtual void OpenCrosh() OVERRIDE;
virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;