summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_instant_controller.h
diff options
context:
space:
mode:
authorkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 06:34:03 +0000
committerkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-27 06:34:03 +0000
commit165fe42611fb0b699c6a5365efb9f028397d88b6 (patch)
tree65b7bf9bf4298c050cdd01f4f076dc934c20e3af /chrome/browser/ui/browser_instant_controller.h
parentaae5d6e59c825a4be4879d94872c084608219fa0 (diff)
downloadchromium_src-165fe42611fb0b699c6a5365efb9f028397d88b6.zip
chromium_src-165fe42611fb0b699c6a5365efb9f028397d88b6.tar.gz
chromium_src-165fe42611fb0b699c6a5365efb9f028397d88b6.tar.bz2
[Clean up] Drop chrome::search:: namespace.
Drop the chrome::search:: namespace, but retain chrome:: for only enums and global functions. Regular classes would be namespace free. BUG=218625 TEST=none Review URL: https://chromiumcodereview.appspot.com/12594017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.h')
-rw-r--r--chrome/browser/ui/browser_instant_controller.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index c84e4dc..9e8bc4a 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -30,10 +30,8 @@ namespace gfx {
class Rect;
}
-namespace chrome {
-
class BrowserInstantController : public content::NotificationObserver,
- public search::SearchModelObserver {
+ public SearchModelObserver {
public:
explicit BrowserInstantController(Browser* browser);
virtual ~BrowserInstantController();
@@ -111,9 +109,8 @@ class BrowserInstantController : public content::NotificationObserver,
void ResetInstant(const std::string& pref_name);
// Overridden from search::SearchModelObserver:
- virtual void ModelChanged(
- const search::SearchModel::State& old_state,
- const search::SearchModel::State& new_state) OVERRIDE;
+ virtual void ModelChanged(const SearchModel::State& old_state,
+ const SearchModel::State& new_state) OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
@@ -144,6 +141,4 @@ class BrowserInstantController : public content::NotificationObserver,
DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
};
-} // namespace chrome
-
#endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_