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

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

Issue 9839028: Make chrome/browser/chrome_browser_main_linux.* Linux-only. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase 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
« no previous file with comments | « chrome/browser/chrome_browser_main_win.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 #if defined(OS_WIN) 96 #if defined(OS_WIN)
97 #include "chrome/browser/chrome_browser_main_win.h" 97 #include "chrome/browser/chrome_browser_main_win.h"
98 #elif defined(OS_MACOSX) 98 #elif defined(OS_MACOSX)
99 #include "chrome/browser/chrome_browser_main_mac.h" 99 #include "chrome/browser/chrome_browser_main_mac.h"
100 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h" 100 #include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
101 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.h" 101 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_mac.h"
102 #elif defined(OS_CHROMEOS) 102 #elif defined(OS_CHROMEOS)
103 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" 103 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
104 #include "chrome/browser/chromeos/login/user_manager.h" 104 #include "chrome/browser/chromeos/login/user_manager.h"
105 #elif defined(OS_LINUX) || defined(OS_OPENBSD) 105 #elif defined(OS_LINUX)
106 #include "chrome/browser/chrome_browser_main_linux.h" 106 #include "chrome/browser/chrome_browser_main_linux.h"
107 #elif defined(OS_POSIX) 107 #elif defined(OS_POSIX)
108 #include "chrome/browser/chrome_browser_main_posix.h" 108 #include "chrome/browser/chrome_browser_main_posix.h"
109 #endif 109 #endif
110 110
111 #if defined(USE_AURA) 111 #if defined(USE_AURA)
112 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h" 112 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h"
113 #elif defined(OS_WIN) 113 #elif defined(OS_WIN)
114 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h" 114 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h"
115 #endif 115 #endif
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( 316 content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
317 const content::MainFunctionParams& parameters) { 317 const content::MainFunctionParams& parameters) {
318 ChromeBrowserMainParts* main_parts; 318 ChromeBrowserMainParts* main_parts;
319 // Construct the Main browser parts based on the OS type. 319 // Construct the Main browser parts based on the OS type.
320 #if defined(OS_WIN) 320 #if defined(OS_WIN)
321 main_parts = new ChromeBrowserMainPartsWin(parameters); 321 main_parts = new ChromeBrowserMainPartsWin(parameters);
322 #elif defined(OS_MACOSX) 322 #elif defined(OS_MACOSX)
323 main_parts = new ChromeBrowserMainPartsMac(parameters); 323 main_parts = new ChromeBrowserMainPartsMac(parameters);
324 #elif defined(OS_CHROMEOS) 324 #elif defined(OS_CHROMEOS)
325 main_parts = new ChromeBrowserMainPartsChromeos(parameters); 325 main_parts = new ChromeBrowserMainPartsChromeos(parameters);
326 #elif defined(OS_LINUX) || defined(OS_OPENBSD) 326 #elif defined(OS_LINUX)
327 main_parts = new ChromeBrowserMainPartsLinux(parameters); 327 main_parts = new ChromeBrowserMainPartsLinux(parameters);
328 #elif defined(OS_ANDROID) 328 #elif defined(OS_ANDROID)
329 // Do nothing for Android. 329 // Do nothing for Android.
330 // TODO(klobag): Android initialization should use the 330 // TODO(klobag): Android initialization should use the
331 // *BrowserMainParts class-hierarchy for setting up custom initialization. 331 // *BrowserMainParts class-hierarchy for setting up custom initialization.
332 main_parts = NULL; 332 main_parts = NULL;
333 #elif defined(OS_POSIX) 333 #elif defined(OS_POSIX)
334 main_parts = new ChromeBrowserMainPartsPosix(parameters); 334 main_parts = new ChromeBrowserMainPartsPosix(parameters);
335 #else 335 #else
336 NOTREACHED(); 336 NOTREACHED();
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1632 #if defined(USE_NSS) 1632 #if defined(USE_NSS)
1633 crypto::CryptoModuleBlockingPasswordDelegate* 1633 crypto::CryptoModuleBlockingPasswordDelegate*
1634 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1634 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1635 const GURL& url) { 1635 const GURL& url) {
1636 return browser::NewCryptoModuleBlockingDialogDelegate( 1636 return browser::NewCryptoModuleBlockingDialogDelegate(
1637 browser::kCryptoModulePasswordKeygen, url.host()); 1637 browser::kCryptoModulePasswordKeygen, url.host());
1638 } 1638 }
1639 #endif 1639 #endif
1640 1640
1641 } // namespace chrome 1641 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698