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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 8402002: Reenable triggering of screen rotations by sensors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address reviewer comments. Created 9 years, 1 month 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/breakpad_mac.h" 8 #include "chrome/app/breakpad_mac.h"
9 #include "chrome/browser/browser_about_handler.h" 9 #include "chrome/browser/browser_about_handler.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #endif 89 #endif
90 90
91 #if defined(USE_AURA) 91 #if defined(USE_AURA)
92 #include "chrome/browser/chrome_browser_parts_aura.h" 92 #include "chrome/browser/chrome_browser_parts_aura.h"
93 #endif 93 #endif
94 94
95 #if defined(TOOLKIT_USES_GTK) 95 #if defined(TOOLKIT_USES_GTK)
96 #include "chrome/browser/chrome_browser_parts_gtk.h" 96 #include "chrome/browser/chrome_browser_parts_gtk.h"
97 #endif 97 #endif
98 98
99 #if defined(TOUCH_UI)
100 #include "chrome/browser/chrome_browser_parts_touch.h"
101 #endif
102
99 #if defined(OS_LINUX) 103 #if defined(OS_LINUX)
100 #include "base/linux_util.h" 104 #include "base/linux_util.h"
101 #include "chrome/browser/crash_handler_host_linux.h" 105 #include "chrome/browser/crash_handler_host_linux.h"
102 #endif 106 #endif
103 107
104 #if defined(TOOLKIT_VIEWS) 108 #if defined(TOOLKIT_VIEWS)
105 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 109 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
106 #elif defined(TOOLKIT_USES_GTK) 110 #elif defined(TOOLKIT_USES_GTK)
107 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" 111 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
108 #elif defined(OS_MACOSX) 112 #elif defined(OS_MACOSX)
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 parts_list->push_back(new ChromeBrowserMainParts(parameters)); 226 parts_list->push_back(new ChromeBrowserMainParts(parameters));
223 #endif 227 #endif
224 228
225 // Construct additional browser parts. 229 // Construct additional browser parts.
226 #if defined(USE_AURA) 230 #if defined(USE_AURA)
227 parts_list->push_back(new ChromeBrowserPartsAura()); 231 parts_list->push_back(new ChromeBrowserPartsAura());
228 #endif 232 #endif
229 #if defined(TOOLKIT_USES_GTK) 233 #if defined(TOOLKIT_USES_GTK)
230 parts_list->push_back(new ChromeBrowserPartsGtk()); 234 parts_list->push_back(new ChromeBrowserPartsGtk());
231 #endif 235 #endif
236 #if defined(TOUCH_UI)
237 parts_list->push_back(new ChromeBrowserPartsTouch());
238 #endif
232 } 239 }
233 240
234 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( 241 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
235 RenderWidgetHost* widget) { 242 RenderWidgetHost* widget) {
236 #if defined(USE_AURA) 243 #if defined(USE_AURA)
237 return new RenderWidgetHostViewAura(widget); 244 return new RenderWidgetHostViewAura(widget);
238 #elif defined(TOUCH_UI) 245 #elif defined(TOUCH_UI)
239 return new RenderWidgetHostViewViews(widget); 246 return new RenderWidgetHostViewViews(widget);
240 #elif defined(OS_WIN) 247 #elif defined(OS_WIN)
241 if (views::Widget::IsPureViews()) 248 if (views::Widget::IsPureViews())
(...skipping 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 #if defined(USE_NSS) 997 #if defined(USE_NSS)
991 crypto::CryptoModuleBlockingPasswordDelegate* 998 crypto::CryptoModuleBlockingPasswordDelegate*
992 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 999 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
993 const GURL& url) { 1000 const GURL& url) {
994 return browser::NewCryptoModuleBlockingDialogDelegate( 1001 return browser::NewCryptoModuleBlockingDialogDelegate(
995 browser::kCryptoModulePasswordKeygen, url.host()); 1002 browser::kCryptoModulePasswordKeygen, url.host());
996 } 1003 }
997 #endif 1004 #endif
998 1005
999 } // namespace chrome 1006 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698