| OLD | NEW | 
|     1 // Copyright 2013 The Chromium Authors. All rights reserved. |     1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
|     2 // Use of this source code is governed by a BSD-style license that can be |     2 // Use of this source code is governed by a BSD-style license that can be | 
|     3 // found in the LICENSE file. |     3 // found in the LICENSE file. | 
|     4  |     4  | 
|     5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |     5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 
|     6  |     6  | 
|     7 #include <vector> |     7 #include <vector> | 
|     8  |     8  | 
|     9 #include "ash/ash_switches.h" |     9 #include "ash/ash_switches.h" | 
|    10 #include "ash/desktop_background/desktop_background_controller.h" |    10 #include "ash/desktop_background/desktop_background_controller.h" | 
| (...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1357     content::WebContents* web_contents) const { |  1357     content::WebContents* web_contents) const { | 
|  1358   base::string16 title = web_contents->GetTitle(); |  1358   base::string16 title = web_contents->GetTitle(); | 
|  1359   if (!title.empty()) |  1359   if (!title.empty()) | 
|  1360     return title; |  1360     return title; | 
|  1361   WebContentsToAppIDMap::const_iterator iter = |  1361   WebContentsToAppIDMap::const_iterator iter = | 
|  1362       web_contents_to_app_id_.find(web_contents); |  1362       web_contents_to_app_id_.find(web_contents); | 
|  1363   if (iter != web_contents_to_app_id_.end()) { |  1363   if (iter != web_contents_to_app_id_.end()) { | 
|  1364     std::string app_id = iter->second; |  1364     std::string app_id = iter->second; | 
|  1365     const extensions::Extension* extension = GetExtensionForAppID(app_id); |  1365     const extensions::Extension* extension = GetExtensionForAppID(app_id); | 
|  1366     if (extension) |  1366     if (extension) | 
|  1367       return UTF8ToUTF16(extension->name()); |  1367       return base::UTF8ToUTF16(extension->name()); | 
|  1368   } |  1368   } | 
|  1369   return l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE); |  1369   return l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE); | 
|  1370 } |  1370 } | 
|  1371  |  1371  | 
|  1372 ash::LauncherID ChromeLauncherController::CreateAppShortcutLauncherItem( |  1372 ash::LauncherID ChromeLauncherController::CreateAppShortcutLauncherItem( | 
|  1373     const std::string& app_id, |  1373     const std::string& app_id, | 
|  1374     int index) { |  1374     int index) { | 
|  1375   return CreateAppShortcutLauncherItemWithType(app_id, |  1375   return CreateAppShortcutLauncherItemWithType(app_id, | 
|  1376                                                index, |  1376                                                index, | 
|  1377                                                ash::TYPE_APP_SHORTCUT); |  1377                                                ash::TYPE_APP_SHORTCUT); | 
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2022 } |  2022 } | 
|  2023  |  2023  | 
|  2024 void ChromeLauncherController::ReleaseProfile() { |  2024 void ChromeLauncherController::ReleaseProfile() { | 
|  2025   if (app_sync_ui_state_) |  2025   if (app_sync_ui_state_) | 
|  2026     app_sync_ui_state_->RemoveObserver(this); |  2026     app_sync_ui_state_->RemoveObserver(this); | 
|  2027  |  2027  | 
|  2028   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); |  2028   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this); | 
|  2029  |  2029  | 
|  2030   pref_change_registrar_.RemoveAll(); |  2030   pref_change_registrar_.RemoveAll(); | 
|  2031 } |  2031 } | 
| OLD | NEW |