Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <numeric> 8 #include <numeric>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "chrome/browser/ui/location_bar/location_bar.h" 73 #include "chrome/browser/ui/location_bar/location_bar.h"
74 #include "chrome/browser/ui/tabs/tab_strip_model.h" 74 #include "chrome/browser/ui/tabs/tab_strip_model.h"
75 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 75 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
76 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" 76 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
77 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h" 77 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
78 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" 78 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
79 #include "chrome/browser/ui/window_sizer/window_sizer.h" 79 #include "chrome/browser/ui/window_sizer/window_sizer.h"
80 #include "chrome/common/chrome_switches.h" 80 #include "chrome/common/chrome_switches.h"
81 #include "chrome/common/extensions/command.h" 81 #include "chrome/common/extensions/command.h"
82 #include "chrome/common/url_constants.h" 82 #include "chrome/common/url_constants.h"
83 #include "chrome/grit/generated_resources.h"
83 #include "components/bookmarks/browser/bookmark_model.h" 84 #include "components/bookmarks/browser/bookmark_model.h"
84 #include "components/signin/core/common/profile_management_switches.h" 85 #include "components/signin/core/common/profile_management_switches.h"
85 #include "components/translate/core/browser/translate_manager.h" 86 #include "components/translate/core/browser/translate_manager.h"
86 #include "components/translate/core/browser/translate_ui_delegate.h" 87 #include "components/translate/core/browser/translate_ui_delegate.h"
87 #include "components/web_modal/popup_manager.h" 88 #include "components/web_modal/popup_manager.h"
88 #include "components/web_modal/web_contents_modal_dialog_manager.h" 89 #include "components/web_modal/web_contents_modal_dialog_manager.h"
89 #include "content/public/browser/render_view_host.h" 90 #include "content/public/browser/render_view_host.h"
90 #include "content/public/browser/render_widget_host_view.h" 91 #include "content/public/browser/render_widget_host_view.h"
91 #include "content/public/browser/web_contents.h" 92 #include "content/public/browser/web_contents.h"
92 #include "grit/generated_resources.h"
93 #include "grit/locale_settings.h" 93 #include "grit/locale_settings.h"
94 #import "ui/base/cocoa/cocoa_base_utils.h" 94 #import "ui/base/cocoa/cocoa_base_utils.h"
95 #include "ui/base/l10n/l10n_util.h" 95 #include "ui/base/l10n/l10n_util.h"
96 #include "ui/base/l10n/l10n_util_mac.h" 96 #include "ui/base/l10n/l10n_util_mac.h"
97 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" 97 #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"
98 98
99 using l10n_util::GetStringUTF16; 99 using l10n_util::GetStringUTF16;
100 using l10n_util::GetNSStringWithFixup; 100 using l10n_util::GetNSStringWithFixup;
101 using l10n_util::GetNSStringFWithFixup; 101 using l10n_util::GetNSStringFWithFixup;
102 102
(...skipping 2171 matching lines...) Expand 10 before | Expand all | Expand 10 after
2274 2274
2275 - (BOOL)supportsBookmarkBar { 2275 - (BOOL)supportsBookmarkBar {
2276 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR]; 2276 return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
2277 } 2277 }
2278 2278
2279 - (BOOL)isTabbedWindow { 2279 - (BOOL)isTabbedWindow {
2280 return browser_->is_type_tabbed(); 2280 return browser_->is_type_tabbed();
2281 } 2281 }
2282 2282
2283 @end // @implementation BrowserWindowController(WindowType) 2283 @end // @implementation BrowserWindowController(WindowType)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698