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

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

Issue 113539: linux: unify all the dialog layout code for visual consistency. (Closed)
Patch Set: last second Created 11 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/gtk/about_chrome_dialog.cc » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #include <commctrl.h> 9 #include <commctrl.h>
10 #endif 10 #endif
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "chrome/installer/util/version.h" 97 #include "chrome/installer/util/version.h"
98 #include "net/base/net_util.h" 98 #include "net/base/net_util.h"
99 #include "net/base/sdch_manager.h" 99 #include "net/base/sdch_manager.h"
100 #include "net/base/winsock_init.h" 100 #include "net/base/winsock_init.h"
101 #include "net/http/http_network_layer.h" 101 #include "net/http/http_network_layer.h"
102 #include "sandbox/src/sandbox.h" 102 #include "sandbox/src/sandbox.h"
103 #include "views/widget/accelerator_handler.h" 103 #include "views/widget/accelerator_handler.h"
104 104
105 #endif // defined(OS_WIN) 105 #endif // defined(OS_WIN)
106 106
107 #if defined(TOOLKIT_GTK)
108 #include "chrome/common/gtk_util.h"
109 #endif
110
107 namespace Platform { 111 namespace Platform {
108 112
109 void WillInitializeMainMessageLoop(const CommandLine & command_line); 113 void WillInitializeMainMessageLoop(const CommandLine & command_line);
110 void WillTerminate(); 114 void WillTerminate();
111 115
112 #if defined(OS_WIN) || defined(OS_LINUX) 116 #if defined(OS_WIN) || defined(OS_LINUX)
113 // Perform any platform-specific work that needs to be done before the main 117 // Perform any platform-specific work that needs to be done before the main
114 // message loop is created and initialized. 118 // message loop is created and initialized.
115 void WillInitializeMainMessageLoop(const CommandLine & command_line) { 119 void WillInitializeMainMessageLoop(const CommandLine & command_line) {
116 } 120 }
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 config.dwICC = ICC_WIN95_CLASSES; 550 config.dwICC = ICC_WIN95_CLASSES;
547 InitCommonControlsEx(&config); 551 InitCommonControlsEx(&config);
548 552
549 win_util::ScopedCOMInitializer com_initializer; 553 win_util::ScopedCOMInitializer com_initializer;
550 554
551 // Init the RLZ library. This just binds the dll and schedules a task on the 555 // Init the RLZ library. This just binds the dll and schedules a task on the
552 // file thread to be run sometime later. If this is the first run we record 556 // file thread to be run sometime later. If this is the first run we record
553 // the installation event. 557 // the installation event.
554 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run); 558 RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run);
555 #endif 559 #endif
560 #if defined(TOOLKIT_GTK)
561 gtk_util::InitRCStyles();
562 #endif
556 563
557 // Config the network module so it has access to resources. 564 // Config the network module so it has access to resources.
558 net::NetModule::SetResourceProvider(NetResourceProvider); 565 net::NetModule::SetResourceProvider(NetResourceProvider);
559 566
560 // Register our global network handler for chrome:// and 567 // Register our global network handler for chrome:// and
561 // chrome-extension:// URLs. 568 // chrome-extension:// URLs.
562 RegisterURLRequestChromeJob(); 569 RegisterURLRequestChromeJob();
563 570
564 #if defined(OS_WIN) 571 #if defined(OS_WIN)
565 RegisterExtensionProtocols(); 572 RegisterExtensionProtocols();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 if (metrics) 677 if (metrics)
671 metrics->Stop(); 678 metrics->Stop();
672 679
673 // browser_shutdown takes care of deleting browser_process, so we need to 680 // browser_shutdown takes care of deleting browser_process, so we need to
674 // release it. 681 // release it.
675 browser_process.release(); 682 browser_process.release();
676 browser_shutdown::Shutdown(); 683 browser_shutdown::Shutdown();
677 684
678 return result_code; 685 return result_code;
679 } 686 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/gtk/about_chrome_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698