Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "chrome/test/base/testing_profile.h" | 8 #include "chrome/test/base/testing_profile.h" |
| 9 #include "chrome/test/base/testing_browser_process.h" | 9 #include "chrome/test/base/testing_browser_process.h" |
| 10 #include "content/browser/tab_contents/tab_contents.h" | 10 #include "content/browser/tab_contents/tab_contents.h" |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 } | 28 } |
| 29 | 29 |
| 30 virtual TabContents* OpenURLFromTab(TabContents* source, | 30 virtual TabContents* OpenURLFromTab(TabContents* source, |
| 31 const OpenURLParams& params) OVERRIDE { | 31 const OpenURLParams& params) OVERRIDE { |
| 32 return NULL; | 32 return NULL; |
| 33 } | 33 } |
| 34 | 34 |
| 35 virtual void NavigationStateChanged(const TabContents* source, | 35 virtual void NavigationStateChanged(const TabContents* source, |
| 36 unsigned changed_flags) {} | 36 unsigned changed_flags) {} |
| 37 | 37 |
| 38 virtual std::string GetNavigationHeaders(const GURL& url) { | 38 virtual void AddNavigationHeaders(const GURL& url, std::string* headers) { |
|
sky
2011/08/30 20:16:33
While you're here add OVERRIDE.
Roger Tawa OOO till Jul 10th
2011/08/31 20:14:01
Done.
| |
| 39 return ""; | |
| 40 } | 39 } |
| 41 | 40 |
| 42 virtual void AddNewContents(TabContents* source, | 41 virtual void AddNewContents(TabContents* source, |
| 43 TabContents* new_contents, | 42 TabContents* new_contents, |
| 44 WindowOpenDisposition disposition, | 43 WindowOpenDisposition disposition, |
| 45 const gfx::Rect& initial_pos, | 44 const gfx::Rect& initial_pos, |
| 46 bool user_gesture) {} | 45 bool user_gesture) {} |
| 47 | 46 |
| 48 virtual void ActivateContents(TabContents* contents) {} | 47 virtual void ActivateContents(TabContents* contents) {} |
| 49 | 48 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 EXPECT_TRUE(contents_a->delegate() == NULL); | 99 EXPECT_TRUE(contents_a->delegate() == NULL); |
| 101 EXPECT_TRUE(contents_b->delegate() == NULL); | 100 EXPECT_TRUE(contents_b->delegate() == NULL); |
| 102 | 101 |
| 103 // Destroy the tab contents and run the message loop to prevent leaks. | 102 // Destroy the tab contents and run the message loop to prevent leaks. |
| 104 contents_a.reset(NULL); | 103 contents_a.reset(NULL); |
| 105 contents_b.reset(NULL); | 104 contents_b.reset(NULL); |
| 106 loop.RunAllPending(); | 105 loop.RunAllPending(); |
| 107 } | 106 } |
| 108 | 107 |
| 109 } // namespace | 108 } // namespace |
| OLD | NEW |