← Back to branch summary

~abreu-alexandre/unity-chromium-extension/fix-1138473

« back to all changes in this revision

Viewing changes to chromium-patches/stable-20.0.1133.0/fix-1034541.patch

  • Committer: Alexandre Abreu
  • Date: 2012-11-14 20:04:23 UTC
  • Revision ID: alexandre.abreu@canonical.com-20121114200423-9ro8j4zkn01dt42v
Update v23 patch to account for new infobars,json file; remove old v20 patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
chromium-patches/stable-20.0.1133.0/fix-1034541.patch
1
 
Index: chrome/browser/ui/browser_list.cc
2
 
===================================================================
3
 
--- chrome/browser/ui/browser_list.cc   (revision 136242)
4
 
+++ chrome/browser/ui/browser_list.cc   (working copy)
5
 
@@ -122,6 +122,7 @@
6
 
 const int kMatchOriginalProfile         = 1 << 0;
7
 
 const int kMatchCanSupportWindowFeature = 1 << 1;
8
 
 const int kMatchTabbed                  = 1 << 2;
9
 
+const int kMatchNonChromeless           = 1 << 3;
10
 
 
11
 
 static BrowserList::BrowserVector& browsers() {
12
 
   CR_DEFINE_STATIC_LOCAL(BrowserList::BrowserVector, browser_vector, ());
13
 
@@ -165,8 +166,12 @@
14
 
   }
15
 
 
16
 
   if (match_types & kMatchTabbed)
17
 
-    return browser->is_type_tabbed();
18
 
+    return browser->is_type_tabbed() &&
19
 
+      !browser->is_chromeless_mode();
20
 
 
21
 
+  if (match_types & kMatchNonChromeless)
22
 
+    return !browser->is_chromeless_mode();
23
 
+
24
 
   return true;
25
 
 }
26
 
 
27
 
@@ -606,7 +611,7 @@
28
 
                              BrowserList::end(),
29
 
                              profile,
30
 
                              Browser::FEATURE_NONE,
31
 
-                             kMatchAny) != NULL;
32
 
+                             kMatchNonChromeless) != NULL;
33
 
 }
34
 
 
35
 
 // static
36
 
@@ -695,7 +700,7 @@
37
 
   // all browsers like FindBrowserWith* do.
38
 
   return FindBrowserMatching(
39
 
       BrowserList::begin_last_active(), BrowserList::end_last_active(), profile,
40
 
-      Browser::FEATURE_NONE, kMatchAny);
41
 
+      Browser::FEATURE_NONE, kMatchNonChromeless);
42
 
 }
43
 
 
44
 
 // static