OLD | NEW |
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 #include "chrome/browser/infobars/infobar_extension_api.h" | 5 #include "chrome/browser/infobars/infobar_extension_api.h" |
6 | 6 |
7 #include "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 base::IntToString(tab_id)); | 67 base::IntToString(tab_id)); |
68 return false; | 68 return false; |
69 } | 69 } |
70 | 70 |
71 tab_contents->infobar_tab_helper()->AddInfoBar( | 71 tab_contents->infobar_tab_helper()->AddInfoBar( |
72 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), | 72 new ExtensionInfoBarDelegate(browser, tab_contents->infobar_tab_helper(), |
73 GetExtension(), url, height)); | 73 GetExtension(), url, height)); |
74 | 74 |
75 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. | 75 // TODO(finnur): Return the actual DOMWindow object. Bug 26463. |
76 DCHECK(browser->extension_window_controller()); | 76 DCHECK(browser->extension_window_controller()); |
77 result_.reset(browser->extension_window_controller()->CreateWindowValue()); | 77 SetResult(browser->extension_window_controller()->CreateWindowValue()); |
78 | 78 |
79 return true; | 79 return true; |
80 } | 80 } |
OLD | NEW |