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

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: clang fix 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 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 // Construct additional browser parts. Stages are called in the order in 338 // Construct additional browser parts. Stages are called in the order in
339 // which they are added. 339 // which they are added.
340 #if defined(TOOLKIT_USES_GTK) 340 #if defined(TOOLKIT_USES_GTK)
341 main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk()); 341 main_parts->AddParts(new ChromeBrowserMainExtraPartsGtk());
342 #endif 342 #endif
343 343
344 #if defined(TOOLKIT_VIEWS) 344 #if defined(TOOLKIT_VIEWS)
345 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); 345 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
346 #endif 346 #endif
347 347
348 #if defined(USE_ASH)
349 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
350 #endif
351
348 #if defined(USE_AURA) 352 #if defined(USE_AURA)
349 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); 353 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
350 #endif 354 #endif
351 355
352 #if defined(USE_ASH)
353 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
354 #endif
355
356 return main_parts; 356 return main_parts;
357 } 357 }
358 358
359 content::WebContentsView* 359 content::WebContentsView*
360 ChromeContentBrowserClient::OverrideCreateWebContentsView( 360 ChromeContentBrowserClient::OverrideCreateWebContentsView(
361 WebContents* web_contents) { 361 WebContents* web_contents) {
362 #if defined(TOOLKIT_VIEWS) 362 #if defined(TOOLKIT_VIEWS)
363 return new TabContentsViewViews(web_contents); 363 return new TabContentsViewViews(web_contents);
364 #endif 364 #endif
365 return NULL; 365 return NULL;
(...skipping 1261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1627 #if defined(USE_NSS) 1627 #if defined(USE_NSS)
1628 crypto::CryptoModuleBlockingPasswordDelegate* 1628 crypto::CryptoModuleBlockingPasswordDelegate*
1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1630 const GURL& url) { 1630 const GURL& url) {
1631 return browser::NewCryptoModuleBlockingDialogDelegate( 1631 return browser::NewCryptoModuleBlockingDialogDelegate(
1632 browser::kCryptoModulePasswordKeygen, url.host()); 1632 browser::kCryptoModulePasswordKeygen, url.host());
1633 } 1633 }
1634 #endif 1634 #endif
1635 1635
1636 } // namespace chrome 1636 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698