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

Unified Diff: trunk/src/chrome/test/base/testing_browser_process.h

Issue 14828010: Revert 200576 "Move winaura specific methods and members from ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/chrome_browser.gypi ('k') | trunk/src/chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/test/base/testing_browser_process.h
===================================================================
--- trunk/src/chrome/test/base/testing_browser_process.h (revision 200655)
+++ trunk/src/chrome/test/base/testing_browser_process.h (working copy)
@@ -105,8 +105,14 @@
virtual BookmarkPromptController* bookmark_prompt_controller() OVERRIDE;
virtual chrome::MediaFileSystemRegistry*
media_file_system_registry() OVERRIDE;
+ virtual void PlatformSpecificCommandLineProcessing(
+ const CommandLine& command_line) OVERRIDE;
virtual bool created_local_state() const OVERRIDE;
+#if defined(OS_WIN) && defined(USE_AURA)
+ virtual void OnMetroViewerProcessTerminated() OVERRIDE {}
+#endif
+
// Set the local state for tests. Consumer is responsible for cleaning it up
// afterwards (using ScopedTestingLocalState, for example).
void SetLocalState(PrefService* local_state);
« no previous file with comments | « trunk/src/chrome/chrome_browser.gypi ('k') | trunk/src/chrome/test/base/testing_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698