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

Side by Side Diff: webkit/glue/webkit_glue.cc

Issue 8670: Switch to using the message loop rather than gtk_main(). (Closed)
Patch Set: Addressing comments Created 12 years, 1 month 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 | « base/logging.h ('k') | webkit/tools/test_shell/SConscript » ('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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 7
8 #if defined(OS_WIN) 8 #if defined(OS_WIN)
9 #include <objidl.h> 9 #include <objidl.h>
10 #include <mlang.h> 10 #include <mlang.h>
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 os_minor_version, 396 os_minor_version,
397 #if defined(OS_MACOSX) 397 #if defined(OS_MACOSX)
398 os_bugfix_version, 398 os_bugfix_version,
399 #endif 399 #endif
400 WEBKIT_VERSION_MAJOR, 400 WEBKIT_VERSION_MAJOR,
401 WEBKIT_VERSION_MINOR, 401 WEBKIT_VERSION_MINOR,
402 product.c_str(), 402 product.c_str(),
403 WEBKIT_VERSION_MAJOR, 403 WEBKIT_VERSION_MAJOR,
404 WEBKIT_VERSION_MINOR 404 WEBKIT_VERSION_MINOR
405 ); 405 );
406 #elif defined(OS_LINUX)
407 // TODO(agl): We don't have version information embedded in files under Linux
408 // so we use the following string which is based off the UA string for
409 // Windows. Some solution for embedding the Chrome version number needs to be
410 // found here.
411 StringAppendF(
412 &default_user_agent,
413 "Mozilla/5.0 (Linux; U; en-US) AppleWebKit/525.13 "
414 "(KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13");
406 #else 415 #else
407 // TODO(port): we need something like FileVersionInfo for our UA string. 416 // TODO(port): we need something like FileVersionInfo for our UA string.
408 NOTIMPLEMENTED(); 417 NOTIMPLEMENTED();
409 #endif 418 #endif
410 user_agent = &default_user_agent; 419 user_agent = &default_user_agent;
411 } 420 }
412 421
413 }; 422 };
414 423
415 void SetUserAgent(const std::string& new_user_agent) { 424 void SetUserAgent(const std::string& new_user_agent) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 } 460 }
452 461
453 g_forcefully_terminate_plugin_process = value; 462 g_forcefully_terminate_plugin_process = value;
454 } 463 }
455 464
456 bool ShouldForcefullyTerminatePluginProcess() { 465 bool ShouldForcefullyTerminatePluginProcess() {
457 return g_forcefully_terminate_plugin_process; 466 return g_forcefully_terminate_plugin_process;
458 } 467 }
459 468
460 } // namespace webkit_glue 469 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « base/logging.h ('k') | webkit/tools/test_shell/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698