chrome/browser/ui/views/location_bar/page_action_image_view.cc - Issue 10911300: Move ExtensionAction from common/ to browser/.

Side by Side Diff: chrome/browser/ui/views/location_bar/page_action_image_view.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: proof of concept Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm ('K') | « chrome/browser/ui/views/location_bar/page_action_image_view.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | chrome/common/extensions/extension.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/ui/views/location_bar/page_action_image_view.h"	5 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/extensions/api/commands/command_service.h"	8 #include "chrome/browser/extensions/api/commands/command_service.h"

9 #include "chrome/browser/extensions/api/commands/command_service_factory.h"	9 #include "chrome/browser/extensions/api/commands/command_service_factory.h"

	10 #include "chrome/browser/extensions/extension_action.h"

10 #include "chrome/browser/extensions/extension_context_menu_model.h"	11 #include "chrome/browser/extensions/extension_context_menu_model.h"

11 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/extensions/extension_tab_util.h"	13 #include "chrome/browser/extensions/extension_tab_util.h"

13 #include "chrome/browser/extensions/location_bar_controller.h"	14 #include "chrome/browser/extensions/location_bar_controller.h"

14 #include "chrome/browser/extensions/tab_helper.h"	15 #include "chrome/browser/extensions/tab_helper.h"

15 #include "chrome/browser/platform_util.h"	16 #include "chrome/browser/platform_util.h"

16 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/sessions/session_id.h"	18 #include "chrome/browser/sessions/session_id.h"

18 #include "chrome/browser/ui/browser_list.h"	19 #include "chrome/browser/ui/browser_list.h"

19 #include "chrome/browser/ui/tab_contents/tab_contents.h"	20 #include "chrome/browser/ui/tab_contents/tab_contents.h"

20 #include "chrome/browser/ui/views/frame/browser_view.h"	21 #include "chrome/browser/ui/views/frame/browser_view.h"

21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

22 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"	23 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"

23 #include "chrome/common/chrome_notification_types.h"	24 #include "chrome/common/chrome_notification_types.h"

24 #include "chrome/common/extensions/extension.h"	25 #include "chrome/common/extensions/extension.h"

25 #include "chrome/common/extensions/extension_action.h"

26 #include "chrome/common/extensions/extension_manifest_constants.h"	26 #include "chrome/common/extensions/extension_manifest_constants.h"

27 #include "chrome/common/extensions/extension_resource.h"	27 #include "chrome/common/extensions/extension_resource.h"

28 #include "content/public/browser/notification_details.h"	28 #include "content/public/browser/notification_details.h"

29 #include "content/public/browser/notification_source.h"	29 #include "content/public/browser/notification_source.h"

30 #include "ui/base/accessibility/accessible_view_state.h"	30 #include "ui/base/accessibility/accessible_view_state.h"

31 #include "ui/base/events/event.h"	31 #include "ui/base/events/event.h"

32 #include "ui/views/controls/menu/menu_item_view.h"	32 #include "ui/views/controls/menu/menu_item_view.h"

33 #include "ui/views/controls/menu/menu_model_adapter.h"	33 #include "ui/views/controls/menu/menu_model_adapter.h"

34 #include "ui/views/controls/menu/menu_runner.h"	34 #include "ui/views/controls/menu/menu_runner.h"

35	35

(...skipping 280 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
316	316

317 popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow_location,	317 popup_ = ExtensionPopup::ShowPopup(popup_url, browser_, this, arrow_location,

318 show_action);	318 show_action);

319 popup_->GetWidget()->AddObserver(this);	319 popup_->GetWidget()->AddObserver(this);

320 }	320 }

321	321

322 void PageActionImageView::HidePopup() {	322 void PageActionImageView::HidePopup() {

323 if (popup_)	323 if (popup_)

324 popup_->GetWidget()->Close();	324 popup_->GetWidget()->Close();

325 }	325 }

OLD	NEW