diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:13:45 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:13:45 +0000 |
| commit | 943d8120c51e2ed0146d85a15298d7fa30f316e0 (patch) | |
| tree | 74d94e42c0590d308074ad8262cbf36656b2e708 /chrome/test | |
| parent | 8e0049d83d792dec1d2981d4f95369ca8a7b0558 (diff) | |
| download | chromium_src-943d8120c51e2ed0146d85a15298d7fa30f316e0.zip chromium_src-943d8120c51e2ed0146d85a15298d7fa30f316e0.tar.gz chromium_src-943d8120c51e2ed0146d85a15298d7fa30f316e0.tar.bz2 | |
Detach reload from omnibox, combine with stop, and eliminate go.
This does the basic surgery on all three OSes without trying to fix up the visual appearance. As a result, things look pretty ugly. My intent is to at least put endcaps on the omnibox in a subsequent patch.
BUG=45745,45762,45763
TEST=Reload and stop should be combined; go should be gone.
Review URL: http://codereview.chromium.org/2677003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/profiles/complex_theme/Default/Extensions/mblmlcbknbnfebdfjnolmcapmdofhmme/1.1/Cached Theme.pak | bin | 1194298 -> 1190341 bytes | |||
| -rw-r--r-- | chrome/test/test_browser_window.h | 2 | ||||
| -rw-r--r-- | chrome/test/test_location_bar.h | 1 |
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 Binary files differindex 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 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() {} |