X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fsync%2Ftab_contents_synced_tab_delegate.cc;h=734f7d644095b4c56ab865e849b9ab41342f03d5;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=40f2d3ac05bc3094c880d7be566fddcb035dd10d;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/src/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc index 40f2d3a..734f7d6 100644 --- a/src/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc +++ b/src/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/sync/glue/synced_window_delegate.h" @@ -14,6 +13,10 @@ #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#if defined(ENABLE_EXTENSIONS) +#include "chrome/browser/extensions/tab_helper.h" +#endif + #if defined(ENABLE_MANAGED_USERS) #include "chrome/browser/supervised_user/supervised_user_navigation_observer.h" #endif @@ -45,9 +48,13 @@ Profile* TabContentsSyncedTabDelegate::profile() const { } std::string TabContentsSyncedTabDelegate::GetExtensionAppId() const { +#if defined(ENABLE_EXTENSIONS) const scoped_refptr extension_app( extensions::TabHelper::FromWebContents(web_contents_)->extension_app()); - return (extension_app.get() ? extension_app->id() : std::string()); + if (extension_app.get()) + return extension_app->id(); +#endif + return std::string(); } int TabContentsSyncedTabDelegate::GetCurrentEntryIndex() const {