Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: chrome/browser/ui/search/instant_controller.h

Issue 12520005: Move desktop-specific Instant bits to c/b/ui/search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_commit_type.h ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
similarity index 98%
rename from chrome/browser/instant/instant_controller.h
rename to chrome/browser/ui/search/instant_controller.h
index ef3261941d94a43398a6c59bec7dba4628a97e99..4c5ceb5d7fe9e1b85de21690a4a849d3f388c961 100644
--- a/chrome/browser/instant/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
-#define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
+#define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
#include <list>
#include <map>
@@ -18,10 +18,10 @@
#include "base/time.h"
#include "base/timer.h"
#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/instant/instant_commit_type.h"
-#include "chrome/browser/instant/instant_overlay_model.h"
-#include "chrome/browser/instant/instant_page.h"
#include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
+#include "chrome/browser/ui/search/instant_commit_type.h"
+#include "chrome/browser/ui/search/instant_overlay_model.h"
+#include "chrome/browser/ui/search/instant_page.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/search_types.h"
#include "content/public/browser/notification_observer.h"
@@ -465,4 +465,4 @@ class InstantController : public InstantPage::Delegate,
DISALLOW_COPY_AND_ASSIGN(InstantController);
};
-#endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
+#endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
« no previous file with comments | « chrome/browser/ui/search/instant_commit_type.h ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698