| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/views/tab_contents/native_tab_contents_container_win.h" | 5 #include "chrome/browser/views/tab_contents/native_tab_contents_container_win.h" |
| 6 | 6 |
| 7 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 7 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
| 8 #include "chrome/browser/tab_contents/interstitial_page.h" | 8 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 9 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
| 10 #include "chrome/browser/view_ids.h" |
| 10 #include "chrome/browser/views/tab_contents/tab_contents_container.h" | 11 #include "chrome/browser/views/tab_contents/tab_contents_container.h" |
| 11 #include "chrome/browser/views/tab_contents/tab_contents_view_win.h" | 12 #include "chrome/browser/views/tab_contents/tab_contents_view_win.h" |
| 12 | 13 |
| 13 #include "views/focus/focus_manager.h" | 14 #include "views/focus/focus_manager.h" |
| 14 | 15 |
| 15 //////////////////////////////////////////////////////////////////////////////// | 16 //////////////////////////////////////////////////////////////////////////////// |
| 16 // NativeTabContentsContainerWin, public: | 17 // NativeTabContentsContainerWin, public: |
| 17 | 18 |
| 18 NativeTabContentsContainerWin::NativeTabContentsContainerWin( | 19 NativeTabContentsContainerWin::NativeTabContentsContainerWin( |
| 19 TabContentsContainer* container) | 20 TabContentsContainer* container) |
| 20 : container_(container) { | 21 : container_(container) { |
| 22 SetID(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW); |
| 21 } | 23 } |
| 22 | 24 |
| 23 NativeTabContentsContainerWin::~NativeTabContentsContainerWin() { | 25 NativeTabContentsContainerWin::~NativeTabContentsContainerWin() { |
| 24 } | 26 } |
| 25 | 27 |
| 26 //////////////////////////////////////////////////////////////////////////////// | 28 //////////////////////////////////////////////////////////////////////////////// |
| 27 // NativeTabContentsContainerWin, NativeTabContentsContainer overrides: | 29 // NativeTabContentsContainerWin, NativeTabContentsContainer overrides: |
| 28 | 30 |
| 29 void NativeTabContentsContainerWin::AttachContents(TabContents* contents) { | 31 void NativeTabContentsContainerWin::AttachContents(TabContents* contents) { |
| 30 // We need to register the tab contents window with the BrowserContainer so | 32 // We need to register the tab contents window with the BrowserContainer so |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 } | 132 } |
| 131 | 133 |
| 132 //////////////////////////////////////////////////////////////////////////////// | 134 //////////////////////////////////////////////////////////////////////////////// |
| 133 // NativeTabContentsContainer, public: | 135 // NativeTabContentsContainer, public: |
| 134 | 136 |
| 135 // static | 137 // static |
| 136 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( | 138 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( |
| 137 TabContentsContainer* container) { | 139 TabContentsContainer* container) { |
| 138 return new NativeTabContentsContainerWin(container); | 140 return new NativeTabContentsContainerWin(container); |
| 139 } | 141 } |
| OLD | NEW |