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

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

Issue 9701098: MultiMonitor support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shutdown order Created 8 years, 9 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) 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // Construct additional browser parts. Stages are called in the order in 335 // Construct additional browser parts. Stages are called in the order in
336 // which they are added. 336 // which they are added.
337 #if defined(TOOLKIT_USES_GTK) 337 #if defined(TOOLKIT_USES_GTK)
338 main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk()); 338 main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk());
339 #endif 339 #endif
340 340
341 #if defined(TOOLKIT_VIEWS) 341 #if defined(TOOLKIT_VIEWS)
342 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); 342 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
343 #endif 343 #endif
344 344
345 #if defined(USE_ASH)
346 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
347 #endif
348
345 #if defined(USE_AURA) 349 #if defined(USE_AURA)
346 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); 350 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
347 #endif 351 #endif
348 352
349 #if defined(USE_ASH)
350 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
351 #endif
352
353 return main_parts; 353 return main_parts;
354 } 354 }
355 355
356 content::WebContentsView* 356 content::WebContentsView*
357 ChromeContentBrowserClient::OverrideCreateWebContentsView( 357 ChromeContentBrowserClient::OverrideCreateWebContentsView(
358 WebContents* web_contents) { 358 WebContents* web_contents) {
359 #if defined(TOOLKIT_VIEWS) 359 #if defined(TOOLKIT_VIEWS)
360 return new TabContentsViewViews(web_contents); 360 return new TabContentsViewViews(web_contents);
361 #endif 361 #endif
362 return NULL; 362 return NULL;
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 #if defined(USE_NSS) 1619 #if defined(USE_NSS)
1620 crypto::CryptoModuleBlockingPasswordDelegate* 1620 crypto::CryptoModuleBlockingPasswordDelegate*
1621 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1621 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1622 const GURL& url) { 1622 const GURL& url) {
1623 return browser::NewCryptoModuleBlockingDialogDelegate( 1623 return browser::NewCryptoModuleBlockingDialogDelegate(
1624 browser::kCryptoModulePasswordKeygen, url.host()); 1624 browser::kCryptoModulePasswordKeygen, url.host());
1625 } 1625 }
1626 #endif 1626 #endif
1627 1627
1628 } // namespace chrome 1628 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698