summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 17:57:17 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 17:57:17 +0000
commit265ccd99339c4a7bcdc3c163692f9344fe9e2ae5 (patch)
treec07c81496c8b66a1d9f55bc7d11ac842151b3e25 /chrome/browser/browser.cc
parent24e2b10503e5f54ce5b4beb96a6403c3a8e7e62f (diff)
downloadchromium_src-265ccd99339c4a7bcdc3c163692f9344fe9e2ae5.zip
chromium_src-265ccd99339c4a7bcdc3c163692f9344fe9e2ae5.tar.gz
chromium_src-265ccd99339c4a7bcdc3c163692f9344fe9e2ae5.tar.bz2
Relanding http://codereview.chromium.org/1746009/show
(fixed the ChromeOS build). The app launcher now uses the location bar (instead of the autocomplete edit), so it has "tab to search" and the icons on the left side, Also split location_bar_view.cc so that every inner-class gets its own .h and .cc file. BUG=None TEST=Make sure the location bar works as expected (tab to search, bookmark star, page actions...). Open the app launcher, make sure "tab to search" works as expected. Review URL: http://codereview.chromium.org/1792010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index a346eb9..ed1e38a 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -102,7 +102,7 @@
#include "chrome/browser/user_data_manager.h"
#include "chrome/browser/view_ids.h"
#include "chrome/browser/views/app_launcher.h"
-#include "chrome/browser/views/location_bar_view.h"
+#include "chrome/browser/views/location_bar/location_bar_view.h"
#endif // OS_WIN
#if defined(OS_MACOSX)