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

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

Issue 149367: Replace instances of LINUX2 with OS_CHROMEOS and linux2 with chromeos. (Closed)
Patch Set: Created 11 years, 5 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 | « chrome/browser/browser.cc ('k') | chrome/browser/gtk/browser_window_gtk.h » ('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 "chrome/browser/browser_init.h" 5 #include "chrome/browser/browser_init.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include "app/win_util.h" 8 #include "app/win_util.h"
9 #endif 9 #endif
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "grit/chromium_strings.h" 53 #include "grit/chromium_strings.h"
54 #include "grit/generated_resources.h" 54 #include "grit/generated_resources.h"
55 #include "grit/locale_settings.h" 55 #include "grit/locale_settings.h"
56 #include "grit/theme_resources.h" 56 #include "grit/theme_resources.h"
57 #include "webkit/glue/webkit_glue.h" 57 #include "webkit/glue/webkit_glue.h"
58 58
59 #if defined(OS_WIN) 59 #if defined(OS_WIN)
60 #include "base/win_util.h" 60 #include "base/win_util.h"
61 #endif 61 #endif
62 62
63 #if defined(LINUX2) 63 #if defined(OS_CHROMEOS)
64 #include "chrome/browser/views/tabs/tab_overview_message_listener.h" 64 #include "chrome/browser/views/tabs/tab_overview_message_listener.h"
65 #endif 65 #endif
66 66
67 namespace { 67 namespace {
68 68
69 class SetAsDefaultBrowserTask : public Task { 69 class SetAsDefaultBrowserTask : public Task {
70 public: 70 public:
71 SetAsDefaultBrowserTask() { } 71 SetAsDefaultBrowserTask() { }
72 virtual void Run() { 72 virtual void Run() {
73 ShellIntegration::SetAsDefaultBrowser(); 73 ShellIntegration::SetAsDefaultBrowser();
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 bool launched = lwp.Launch(profile, process_startup); 334 bool launched = lwp.Launch(profile, process_startup);
335 in_startup = false; 335 in_startup = false;
336 336
337 if (!launched) { 337 if (!launched) {
338 LOG(ERROR) << "launch error"; 338 LOG(ERROR) << "launch error";
339 if (return_code) 339 if (return_code)
340 *return_code = ResultCodes::INVALID_CMDLINE_URL; 340 *return_code = ResultCodes::INVALID_CMDLINE_URL;
341 return false; 341 return false;
342 } 342 }
343 343
344 #if defined(LINUX2) 344 #if defined(OS_CHROMEOS)
345 // Create the TabOverviewMessageListener so that it can listen for messages 345 // Create the TabOverviewMessageListener so that it can listen for messages
346 // regardless of what window has focus. 346 // regardless of what window has focus.
347 TabOverviewMessageListener::instance(); 347 TabOverviewMessageListener::instance();
348 #endif 348 #endif
349 return true; 349 return true;
350 } 350 }
351 351
352 #if defined(OS_WIN) 352 #if defined(OS_WIN)
353 GURL GetWelcomePageURL() { 353 GURL GetWelcomePageURL() {
354 std::wstring welcome_url = l10n_util::GetString(IDS_WELCOME_PAGE_URL); 354 std::wstring welcome_url = l10n_util::GetString(IDS_WELCOME_PAGE_URL);
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 scoped_refptr<AutomationProviderClass> automation = 807 scoped_refptr<AutomationProviderClass> automation =
808 new AutomationProviderClass(profile); 808 new AutomationProviderClass(profile);
809 automation->ConnectToChannel(channel_id); 809 automation->ConnectToChannel(channel_id);
810 automation->SetExpectedTabCount(expected_tabs); 810 automation->SetExpectedTabCount(expected_tabs);
811 811
812 AutomationProviderList* list = 812 AutomationProviderList* list =
813 g_browser_process->InitAutomationProviderList(); 813 g_browser_process->InitAutomationProviderList();
814 DCHECK(list); 814 DCHECK(list);
815 list->AddProvider(automation); 815 list->AddProvider(automation);
816 } 816 }
OLDNEW
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/gtk/browser_window_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698