Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Side by Side Diff: chrome/test/base/test_browser_window.h

Issue 540483002: Fix regression in showing bookmark star when an extension should override it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_ 5 #ifndef CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
6 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_ 6 #define CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 virtual GURL GetDestinationURL() const OVERRIDE; 172 virtual GURL GetDestinationURL() const OVERRIDE;
173 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 173 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
174 virtual content::PageTransition GetPageTransition() const OVERRIDE; 174 virtual content::PageTransition GetPageTransition() const OVERRIDE;
175 virtual void AcceptInput() OVERRIDE {} 175 virtual void AcceptInput() OVERRIDE {}
176 virtual void FocusLocation(bool select_all) OVERRIDE {} 176 virtual void FocusLocation(bool select_all) OVERRIDE {}
177 virtual void FocusSearch() OVERRIDE {} 177 virtual void FocusSearch() OVERRIDE {}
178 virtual void UpdateContentSettingsIcons() OVERRIDE {} 178 virtual void UpdateContentSettingsIcons() OVERRIDE {}
179 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE {} 179 virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE {}
180 virtual void UpdatePageActions() OVERRIDE {} 180 virtual void UpdatePageActions() OVERRIDE {}
181 virtual void InvalidatePageActions() OVERRIDE {} 181 virtual void InvalidatePageActions() OVERRIDE {}
182 virtual void UpdateBookmarkStarVisibility() OVERRIDE {}
182 virtual bool ShowPageActionPopup(const extensions::Extension* extension, 183 virtual bool ShowPageActionPopup(const extensions::Extension* extension,
183 bool grant_active_tab) OVERRIDE; 184 bool grant_active_tab) OVERRIDE;
184 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE {} 185 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE {}
185 virtual void UpdateGeneratedCreditCardView() OVERRIDE {} 186 virtual void UpdateGeneratedCreditCardView() OVERRIDE {}
186 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE {} 187 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE {}
187 virtual void Revert() OVERRIDE {} 188 virtual void Revert() OVERRIDE {}
188 virtual const OmniboxView* GetOmniboxView() const OVERRIDE; 189 virtual const OmniboxView* GetOmniboxView() const OVERRIDE;
189 virtual OmniboxView* GetOmniboxView() OVERRIDE; 190 virtual OmniboxView* GetOmniboxView() OVERRIDE;
190 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 191 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
191 192
192 private: 193 private:
193 DISALLOW_COPY_AND_ASSIGN(TestLocationBar); 194 DISALLOW_COPY_AND_ASSIGN(TestLocationBar);
194 }; 195 };
195 196
196 TestDownloadShelf download_shelf_; 197 TestDownloadShelf download_shelf_;
197 TestLocationBar location_bar_; 198 TestLocationBar location_bar_;
198 199
199 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow); 200 DISALLOW_COPY_AND_ASSIGN(TestBrowserWindow);
200 }; 201 };
201 202
202 namespace chrome { 203 namespace chrome {
203 204
204 // Helper that handle the lifetime of TestBrowserWindow instances. 205 // Helper that handle the lifetime of TestBrowserWindow instances.
205 Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params); 206 Browser* CreateBrowserWithTestWindowForParams(Browser::CreateParams* params);
206 207
207 } // namespace chrome 208 } // namespace chrome
208 209
209 #endif // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_ 210 #endif // CHROME_TEST_BASE_TEST_BROWSER_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698