chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm » ('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 #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controlle r.h"	5 #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controlle r.h"

6	6

7 #include "base/i18n/rtl.h"	7 #include "base/i18n/rtl.h"

8 #include "base/mac/bundle_locations.h"	8 #include "base/mac/bundle_locations.h"

9 #include "base/mac/mac_util.h"	9 #include "base/mac/mac_util.h"

10 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

(...skipping 19 matching lines...) Expand all Loading...
30 #include "chrome/browser/ui/cocoa/new_tab_button.h"	30 #include "chrome/browser/ui/cocoa/new_tab_button.h"

31 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"	31 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"

32 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"	32 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

33 #include "chrome/browser/ui/singleton_tabs.h"	33 #include "chrome/browser/ui/singleton_tabs.h"

34 #include "chrome/browser/ui/sync/sync_promo_ui.h"	34 #include "chrome/browser/ui/sync/sync_promo_ui.h"

35 #include "chrome/common/extensions/api/commands/commands_handler.h"	35 #include "chrome/common/extensions/api/commands/commands_handler.h"

36 #include "chrome/common/extensions/api/extension_action/action_info.h"	36 #include "chrome/common/extensions/api/extension_action/action_info.h"

37 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"	37 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"

38 #include "chrome/common/extensions/sync_helper.h"	38 #include "chrome/common/extensions/sync_helper.h"

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

	40 #include "chrome/grit/chromium_strings.h"

	41 #include "chrome/grit/generated_resources.h"

40 #include "content/public/browser/notification_details.h"	42 #include "content/public/browser/notification_details.h"

41 #include "content/public/browser/notification_registrar.h"	43 #include "content/public/browser/notification_registrar.h"

42 #include "content/public/browser/notification_source.h"	44 #include "content/public/browser/notification_source.h"

43 #include "extensions/common/extension.h"	45 #include "extensions/common/extension.h"

44 #include "grit/chromium_strings.h"

45 #include "grit/generated_resources.h"

46 #import "skia/ext/skia_utils_mac.h"	46 #import "skia/ext/skia_utils_mac.h"

47 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"	47 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw eaker.h"

48 #include "ui/base/l10n/l10n_util.h"	48 #include "ui/base/l10n/l10n_util.h"

49	49

50 using content::BrowserThread;	50 using content::BrowserThread;

51 using extensions::BundleInstaller;	51 using extensions::BundleInstaller;

52 using extensions::Extension;	52 using extensions::Extension;

53 using extensions::UnloadedExtensionInfo;	53 using extensions::UnloadedExtensionInfo;

54	54

55 // C++ class that receives EXTENSION_LOADED notifications and proxies them back	55 // C++ class that receives EXTENSION_LOADED notifications and proxies them back

(...skipping 641 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
697 ExtensionInstallUI::OpenAppInstalledUI(browser_->profile(), extension_->id());	697 ExtensionInstallUI::OpenAppInstalledUI(browser_->profile(), extension_->id());

698 }	698 }

699	699

700 - (void)awakeFromNib {	700 - (void)awakeFromNib {

701 if (bundle_)	701 if (bundle_)

702 return;	702 return;

703 [self initializeLabel];	703 [self initializeLabel];

704 }	704 }

705	705

706 @end	706 @end

OLD	NEW