| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extensions/extension_toolbar_model.h" | 5 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 11 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
| 12 #include "chrome/browser/extensions/extension_action.h" | 12 #include "chrome/browser/extensions/extension_action.h" |
| 13 #include "chrome/browser/extensions/extension_action_manager.h" | 13 #include "chrome/browser/extensions/extension_action_manager.h" |
| 14 #include "chrome/browser/extensions/extension_prefs.h" | |
| 15 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
| 16 #include "chrome/browser/extensions/extension_tab_util.h" | 15 #include "chrome/browser/extensions/extension_tab_util.h" |
| 17 #include "chrome/browser/extensions/extension_toolbar_model_factory.h" | 16 #include "chrome/browser/extensions/extension_toolbar_model_factory.h" |
| 18 #include "chrome/browser/extensions/extension_util.h" | 17 #include "chrome/browser/extensions/extension_util.h" |
| 19 #include "chrome/browser/extensions/tab_helper.h" | 18 #include "chrome/browser/extensions/tab_helper.h" |
| 20 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
| 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 23 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
| 24 #include "content/public/browser/notification_details.h" | 23 #include "content/public/browser/notification_details.h" |
| 25 #include "content/public/browser/notification_source.h" | 24 #include "content/public/browser/notification_source.h" |
| 26 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
| 26 #include "extensions/browser/extension_prefs.h" |
| 27 #include "extensions/browser/pref_names.h" | 27 #include "extensions/browser/pref_names.h" |
| 28 #include "extensions/common/extension.h" | 28 #include "extensions/common/extension.h" |
| 29 #include "extensions/common/extension_set.h" | 29 #include "extensions/common/extension_set.h" |
| 30 #include "extensions/common/feature_switch.h" | 30 #include "extensions/common/feature_switch.h" |
| 31 | 31 |
| 32 using extensions::Extension; | 32 using extensions::Extension; |
| 33 using extensions::ExtensionIdList; | 33 using extensions::ExtensionIdList; |
| 34 using extensions::ExtensionList; | 34 using extensions::ExtensionList; |
| 35 | 35 |
| 36 bool ExtensionToolbarModel::Observer::BrowserActionShowPopup( | 36 bool ExtensionToolbarModel::Observer::BrowserActionShowPopup( |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 for (ExtensionList::const_iterator extension = toolbar_items_.begin(); | 498 for (ExtensionList::const_iterator extension = toolbar_items_.begin(); |
| 499 extension != toolbar_items_.end(); ++extension) { | 499 extension != toolbar_items_.end(); ++extension) { |
| 500 if ((*extension)->id() == (*it)) { | 500 if ((*extension)->id() == (*it)) { |
| 501 if (extension - toolbar_items_.begin() >= visible_icon_count_) | 501 if (extension - toolbar_items_.begin() >= visible_icon_count_) |
| 502 MoveBrowserAction(*extension, 0); | 502 MoveBrowserAction(*extension, 0); |
| 503 break; | 503 break; |
| 504 } | 504 } |
| 505 } | 505 } |
| 506 } | 506 } |
| 507 } | 507 } |
| OLD | NEW |