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

Side by Side Diff: chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc

Issue 7256001: Fix a few issues with Chrome-in-Views-Desktop: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 | Annotate | Revision Log
OLDNEW
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 "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win .h" 5 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win .h"
6 6
7 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" 7 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
8 #include "chrome/browser/ui/view_ids.h" 8 #include "chrome/browser/ui/view_ids.h"
9 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_vie ws.h"
9 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" 10 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
10 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 11 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
11 #include "content/browser/renderer_host/render_widget_host_view.h" 12 #include "content/browser/renderer_host/render_widget_host_view.h"
12 #include "content/browser/tab_contents/interstitial_page.h" 13 #include "content/browser/tab_contents/interstitial_page.h"
13 #include "content/browser/tab_contents/tab_contents.h" 14 #include "content/browser/tab_contents/tab_contents.h"
14 #include "ui/base/accessibility/accessible_view_state.h" 15 #include "ui/base/accessibility/accessible_view_state.h"
15 #include "views/focus/focus_manager.h" 16 #include "views/focus/focus_manager.h"
16 17
17 //////////////////////////////////////////////////////////////////////////////// 18 ////////////////////////////////////////////////////////////////////////////////
18 // NativeTabContentsContainerWin, public: 19 // NativeTabContentsContainerWin, public:
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 150
150 return View::GetNativeViewAccessible(); 151 return View::GetNativeViewAccessible();
151 } 152 }
152 153
153 //////////////////////////////////////////////////////////////////////////////// 154 ////////////////////////////////////////////////////////////////////////////////
154 // NativeTabContentsContainer, public: 155 // NativeTabContentsContainer, public:
155 156
156 // static 157 // static
157 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( 158 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
158 TabContentsContainer* container) { 159 TabContentsContainer* container) {
160 if (views::Widget::IsPureViews())
161 return new NativeTabContentsContainerViews(container);
159 return new NativeTabContentsContainerWin(container); 162 return new NativeTabContentsContainerWin(container);
160 } 163 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698