diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:21:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 01:21:31 +0000 |
| commit | b3841c50db1323405954b8fc9f7db6095e886546 (patch) | |
| tree | 72a139a1aebf89d2d2bd852f059fe3c58170382c /chrome/browser/instant | |
| parent | 9d51333be541c5876819005c3422b649585f191a (diff) | |
| download | chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.zip chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.tar.gz chromium_src-b3841c50db1323405954b8fc9f7db6095e886546.tar.bz2 | |
Update a bunch of files to the new location of notification files.
Second part of the remaining files.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6639008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/instant/instant_loader.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index f0dbe53..c556dff 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -4,10 +4,10 @@ #include "chrome/browser/instant/instant_controller.h" -#include "build/build_config.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" +#include "build/build_config.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/instant/instant_delegate.h" #include "chrome/browser/instant/instant_loader.h" @@ -20,11 +20,11 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/notification_service.h" // Number of ms to delay between loading urls. static const int kUpdateDelayMS = 200; diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 74700c8..3840e65 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -21,12 +21,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/notification_details.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" -#include "chrome/common/notification_service.h" -#include "chrome/common/notification_source.h" -#include "chrome/common/notification_type.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/renderer_preferences.h" @@ -38,6 +32,12 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/notification_details.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" +#include "content/common/notification_service.h" +#include "content/common/notification_source.h" +#include "content/common/notification_type.h" #include "net/http/http_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h index 4a1fc3e..aaae7bf 100644 --- a/chrome/browser/instant/instant_loader.h +++ b/chrome/browser/instant/instant_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,9 +12,9 @@ #include "base/timer.h" #include "chrome/browser/instant/instant_commit_type.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" +#include "content/common/notification_observer.h" +#include "content/common/notification_registrar.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" |