chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - Issue 10826219: launcher: Fix include paths and header guards.

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Issue 10826219: launcher: Fix include paths and header guards. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
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/ash/launcher/chrome_launcher_controller.h"	5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

6	6

7 #include <set>	7 #include <set>

8 #include <vector>	8 #include <vector>

9	9

10 #include "ash/launcher/launcher_model.h"	10 #include "ash/launcher/launcher_model.h"

11 #include "ash/launcher/launcher_types.h"	11 #include "ash/launcher/launcher_types.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/wm/window_util.h"	13 #include "ash/wm/window_util.h"

14 #include "base/command_line.h"	14 #include "base/command_line.h"

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

16 #include "base/values.h"	16 #include "base/values.h"

17 #include "chrome/browser/defaults.h"	17 #include "chrome/browser/defaults.h"

18 #include "chrome/browser/extensions/extension_service.h"	18 #include "chrome/browser/extensions/extension_service.h"

19 #include "chrome/browser/prefs/incognito_mode_prefs.h"	19 #include "chrome/browser/prefs/incognito_mode_prefs.h"

20 #include "chrome/browser/prefs/pref_service.h"	20 #include "chrome/browser/prefs/pref_service.h"

21 #include "chrome/browser/prefs/scoped_user_pref_update.h"	21 #include "chrome/browser/prefs/scoped_user_pref_update.h"

22 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/profiles/profile_manager.h"	23 #include "chrome/browser/profiles/profile_manager.h"

24 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"	24 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"

25 #include "chrome/browser/ui/ash/extension_utils.h"	25 #include "chrome/browser/ui/ash/extension_utils.h"

	26 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"

	27 #include "chrome/browser/ui/ash/launcher/launcher_app_icon_loader.h"

	28 #include "chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h"

	29 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"

26 #include "chrome/browser/ui/browser.h"	30 #include "chrome/browser/ui/browser.h"

27 #include "chrome/browser/ui/browser_commands.h"	31 #include "chrome/browser/ui/browser_commands.h"

28 #include "chrome/browser/ui/browser_finder.h"	32 #include "chrome/browser/ui/browser_finder.h"

29 #include "chrome/browser/ui/browser_window.h"	33 #include "chrome/browser/ui/browser_window.h"

30 #include "chrome/browser/ui/extensions/shell_window.h"	34 #include "chrome/browser/ui/extensions/shell_window.h"

31 #include "chrome/browser/ui/tab_contents/tab_contents.h"	35 #include "chrome/browser/ui/tab_contents/tab_contents.h"

32 #include "chrome/browser/ui/tabs/tab_strip_model.h"	36 #include "chrome/browser/ui/tabs/tab_strip_model.h"

33 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller. h"

34 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h"

35 #include "chrome/browser/ui/views/ash/launcher/launcher_app_tab_helper.h"

36 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"

37 #include "chrome/browser/web_applications/web_app.h"	37 #include "chrome/browser/web_applications/web_app.h"

38 #include "chrome/common/chrome_notification_types.h"	38 #include "chrome/common/chrome_notification_types.h"

39 #include "chrome/common/chrome_switches.h"	39 #include "chrome/common/chrome_switches.h"

40 #include "chrome/common/extensions/extension.h"	40 #include "chrome/common/extensions/extension.h"

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

42 #include "chrome/common/pref_names.h"	42 #include "chrome/common/pref_names.h"

43 #include "content/public/browser/notification_service.h"	43 #include "content/public/browser/notification_service.h"

44 #include "content/public/browser/web_contents.h"	44 #include "content/public/browser/web_contents.h"

45 #include "grit/theme_resources.h"	45 #include "grit/theme_resources.h"

46 #include "ui/aura/client/activation_client.h"	46 #include "ui/aura/client/activation_client.h"

(...skipping 942 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
989 }	989 }

990 model_->AddAt(index, item);	990 model_->AddAt(index, item);

991	991

992 if (!controller \|\| controller->type() !=	992 if (!controller \|\| controller->type() !=

993 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {	993 BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {

994 if (item.status != ash::STATUS_IS_PENDING)	994 if (item.status != ash::STATUS_IS_PENDING)

995 app_icon_loader_->FetchImage(app_id);	995 app_icon_loader_->FetchImage(app_id);

996 }	996 }

997 return id;	997 return id;

998 }	998 }

OLD	NEW