diff options
| author | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 15:53:59 +0000 |
|---|---|---|
| committer | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-28 15:53:59 +0000 |
| commit | 37c917b70ee66ca857a0f2d5bbd51edd1c1c6bf6 (patch) | |
| tree | eeb72eca2baa2382e3550fe21ee071fbdccfe406 /chrome/browser/instant/instant_controller.cc | |
| parent | 0f97d56503691e0ccde70a1eb388e6101b4c2023 (diff) | |
| download | chromium_src-37c917b70ee66ca857a0f2d5bbd51edd1c1c6bf6.zip chromium_src-37c917b70ee66ca857a0f2d5bbd51edd1c1c6bf6.tar.gz chromium_src-37c917b70ee66ca857a0f2d5bbd51edd1c1c6bf6.tar.bz2 | |
Upstream minor instant refactoring.
This change should introduce no new behavior. It is intended to simplify
upstreaming more significant changes from our branch in later changes.
- Update a bunch of comments.
- Rename InstantDelegate to InstantControllerDelegate.
- Rename TabContentsDelegateImpl to WebContentsDelegateImpl.
BUG=134865
TEST=
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10704006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant/instant_controller.cc')
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index eba6f50..629bdc6 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -10,7 +10,7 @@ #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_controller_delegate.h" #include "chrome/browser/instant/instant_loader.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" @@ -33,7 +33,7 @@ #include "ui/views/widget/widget.h" #endif -InstantController::InstantController(InstantDelegate* delegate, +InstantController::InstantController(InstantControllerDelegate* delegate, Mode mode) : delegate_(delegate), is_displayable_(false), |