| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| index 59d5e42f98265da21daa96f09b8ff1f7c2fde7ee..81d5c09f8fe6a30587d5c2e40775c753110834ee 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| @@ -20,6 +20,7 @@
|
| #include "ash/wm/window_util.h"
|
| #include "base/command_line.h"
|
| #include "base/prefs/scoped_user_pref_update.h"
|
| +#include "base/strings/pattern.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -1349,8 +1350,8 @@ bool ChromeLauncherController::ContentCanBeHandledByGmailApp(
|
| // We need to extend the application matching for the gMail app beyond the
|
| // manifest file's specification. This is required because of the namespace
|
| // overlap with the offline app ("/mail/mu/").
|
| - if (!MatchPattern(url.path(), "/mail/mu/*") &&
|
| - MatchPattern(url.path(), "/mail/*") &&
|
| + if (!base::MatchPattern(url.path(), "/mail/mu/*") &&
|
| + base::MatchPattern(url.path(), "/mail/*") &&
|
| GetExtensionForAppID(kGmailAppId) &&
|
| GetExtensionForAppID(kGmailAppId)->OverlapsWithOrigin(url))
|
| return true;
|
|
|