mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-23 17:42:45 +00:00
38 lines
939 B
Diff
38 lines
939 B
Diff
--- chromium-54.0.2840.16/chrome/browser/extensions/api/tabs/tabs_api.cc.no-ash 2016-09-09 00:02:22.000000000 +0200
|
|
+++ chromium-54.0.2840.16/chrome/browser/extensions/api/tabs/tabs_api.cc 2016-09-13 06:30:44.958499013 +0200
|
|
@@ -260,6 +260,7 @@
|
|
return true;
|
|
}
|
|
|
|
+#if defined(USE_ASH)
|
|
bool IsHangoutsExtensionId(const std::string& extension_id) {
|
|
for (const char* id : extension_misc::kHangoutsExtensionIds) {
|
|
if (extension_id == id)
|
|
@@ -267,6 +268,7 @@
|
|
}
|
|
return false;
|
|
}
|
|
+#endif // defined(USE_ASH)
|
|
|
|
} // namespace
|
|
|
|
@@ -520,7 +522,9 @@
|
|
|
|
gfx::Rect window_bounds;
|
|
bool focused = true;
|
|
+#if defined(USE_ASH)
|
|
bool saw_focus_key = false;
|
|
+#endif // defined(USE_ASH)
|
|
std::string extension_id;
|
|
|
|
if (create_data) {
|
|
@@ -593,7 +597,9 @@
|
|
|
|
if (create_data->focused) {
|
|
focused = *create_data->focused;
|
|
+#if defined(USE_ASH)
|
|
saw_focus_key = true;
|
|
+#endif // defined(USE_ASH)
|
|
}
|
|
}
|
|
|