summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pakbin1194298 -> 1190341 bytes
-rw-r--r--chrome/test/test_browser_window.h2
-rw-r--r--chrome/test/test_location_bar.h1
3 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
index 42bd2fd..0de5e42 100644
--- a/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
+++ b/chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak
Binary files differ
diff --git a/chrome/test/test_browser_window.h b/chrome/test/test_browser_window.h
index b35e070..adf3277 100644
--- a/chrome/test/test_browser_window.h
+++ b/chrome/test/test_browser_window.h
@@ -43,7 +43,7 @@ class TestBrowserWindow : public BrowserWindow {
return const_cast<TestLocationBar*>(&location_bar_);
}
virtual void SetFocusToLocationBar(bool select_all) {}
- virtual void UpdateStopGoState(bool is_loading, bool force) {}
+ virtual void UpdateReloadStopState(bool is_loading, bool force) {}
virtual void UpdateToolbar(TabContents* contents,
bool should_restore_state) {}
virtual void FocusToolbar() {}
diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h
index 6face25..3b329bd 100644
--- a/chrome/test/test_location_bar.h
+++ b/chrome/test/test_location_bar.h
@@ -35,7 +35,6 @@ class TestLocationBar : public LocationBar {
}
virtual PageTransition::Type GetPageTransition() const { return transition_; }
virtual void AcceptInput() {}
- virtual void AcceptInputWithDisposition(WindowOpenDisposition) {}
virtual void FocusLocation(bool select_all) {}
virtual void FocusSearch() {}
virtual void UpdateContentSettingsIcons() {}