Rename ui_integration to integration.

gyp/sources.txt

@@ -100,6 +100,8 @@
 <(src_loc)/ui/focus_persister.h
 <(src_loc)/ui/inactive_press.cpp
 <(src_loc)/ui/inactive_press.h
+<(src_loc)/ui/integration.cpp
+<(src_loc)/ui/integration.h
 <(src_loc)/ui/main_queue_processor.cpp
 <(src_loc)/ui/main_queue_processor.h
 <(src_loc)/ui/painter.h
@@ -108,8 +110,6 @@
 <(src_loc)/ui/round_rect.h
 <(src_loc)/ui/rp_widget.cpp
 <(src_loc)/ui/rp_widget.h
-<(src_loc)/ui/ui_integration.cpp
-<(src_loc)/ui/ui_integration.h
 <(src_loc)/ui/ui_log.cpp
 <(src_loc)/ui/ui_log.h
 <(src_loc)/ui/ui_utility.cpp

ui/abstract_button.cpp

@@ -7,7 +7,7 @@
 #include "ui/abstract_button.h"
 
 #include "ui/ui_utility.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtGui/QtEvents>
 

ui/basic_click_handlers.cpp

@@ -8,7 +8,7 @@
 
 #include "ui/widgets/tooltip.h"
 #include "ui/text/text_entity.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 #include "base/qthelp_url.h"
 
 #include <QtCore/QUrl>

ui/integration.cpp

@@ -4,7 +4,7 @@
 // For license and copyright information please follow this link:
 // https://github.com/desktop-app/legal/blob/master/LEGAL
 //
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include "ui/text/text_entity.h"
 #include "ui/basic_click_handlers.h"
@@ -29,9 +29,9 @@ Integration &Integration::Instance() {
 void Integration::textActionsUpdated() {
 }
 
-void Integration::activationFromTopPanel() {		
+void Integration::activationFromTopPanel() {
 }
-	
+
 std::shared_ptr<ClickHandler> Integration::createLinkHandler(
 		EntityType type,
 		const QString &text,

ui/platform/mac/ui_platform_utility_mac.mm

@@ -6,7 +6,7 @@
 //
 #include "ui/platform/mac/ui_platform_utility_mac.h"
 
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtGui/QPainter>
 #include <QtGui/QtEvents>

ui/text/text.cpp

@@ -10,7 +10,7 @@
 #include "ui/text/text_block.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/emoji_config.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 #include "base/platform/base_platform_info.h"
 
 #include <private/qfontengine_p.h>

ui/ui_log.cpp

@@ -6,7 +6,7 @@
 //
 #include "ui/ui_log.h"
 
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 namespace Ui {
 

ui/ui_utility.h

@@ -8,7 +8,7 @@
 
 #include "base/unique_qptr.h"
 #include "ui/rect_part.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtCore/QEvent>