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

Side by Side Diff: Source/core/inspector/InspectorOverlay.cpp

Issue 14516007: Remove OS(IOS) and OS(MAC_OS_X) guards. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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 | « Source/core/html/shadow/SpinButtonElement.cpp ('k') | Source/core/page/NavigatorBase.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 frame->view()->setCanHaveScrollbars(false); 455 frame->view()->setCanHaveScrollbars(false);
456 frame->view()->setTransparent(true); 456 frame->view()->setTransparent(true);
457 ASSERT(loader->activeDocumentLoader()); 457 ASSERT(loader->activeDocumentLoader());
458 loader->activeDocumentLoader()->writer()->setMIMEType("text/html"); 458 loader->activeDocumentLoader()->writer()->setMIMEType("text/html");
459 loader->activeDocumentLoader()->writer()->begin(); 459 loader->activeDocumentLoader()->writer()->begin();
460 loader->activeDocumentLoader()->writer()->addData(reinterpret_cast<const cha r*>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html)); 460 loader->activeDocumentLoader()->writer()->addData(reinterpret_cast<const cha r*>(InspectorOverlayPage_html), sizeof(InspectorOverlayPage_html));
461 loader->activeDocumentLoader()->writer()->end(); 461 loader->activeDocumentLoader()->writer()->end();
462 462
463 #if OS(WINDOWS) 463 #if OS(WINDOWS)
464 evaluateInOverlay("setPlatform", "windows"); 464 evaluateInOverlay("setPlatform", "windows");
465 #elif OS(MAC_OS_X) 465 #elif OS(DARWIN)
466 evaluateInOverlay("setPlatform", "mac"); 466 evaluateInOverlay("setPlatform", "mac");
467 #elif OS(UNIX) 467 #elif OS(UNIX)
468 evaluateInOverlay("setPlatform", "linux"); 468 evaluateInOverlay("setPlatform", "linux");
469 #endif 469 #endif
470 470
471 return m_overlayPage.get(); 471 return m_overlayPage.get();
472 } 472 }
473 473
474 void InspectorOverlay::reset(const IntSize& viewportSize, const IntSize& frameVi ewFullSize) 474 void InspectorOverlay::reset(const IntSize& viewportSize, const IntSize& frameVi ewFullSize)
475 { 475 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 info.addMember(m_size, "size"); 512 info.addMember(m_size, "size");
513 } 513 }
514 514
515 void InspectorOverlay::freePage() 515 void InspectorOverlay::freePage()
516 { 516 {
517 m_overlayPage.clear(); 517 m_overlayPage.clear();
518 } 518 }
519 519
520 } // namespace WebCore 520 } // namespace WebCore
521 521
OLDNEW
« no previous file with comments | « Source/core/html/shadow/SpinButtonElement.cpp ('k') | Source/core/page/NavigatorBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698