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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_cocoa.mm

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
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/cocoa/browser_window_cocoa.h" 5 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #import "base/mac/sdk_forward_declarations.h" 10 #import "base/mac/sdk_forward_declarations.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
14 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
15 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/download/download_shelf.h" 16 #include "chrome/browser/download/download_shelf.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/fullscreen.h" 19 #include "chrome/browser/fullscreen.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/shell_integration.h" 21 #include "chrome/browser/shell_integration.h"
(...skipping 25 matching lines...) Expand all
48 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 47 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
49 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h" 48 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
50 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 49 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
51 #include "chrome/browser/ui/search/search_model.h" 50 #include "chrome/browser/ui/search/search_model.h"
52 #include "chrome/browser/ui/tabs/tab_strip_model.h" 51 #include "chrome/browser/ui/tabs/tab_strip_model.h"
53 #include "chrome/browser/web_applications/web_app.h" 52 #include "chrome/browser/web_applications/web_app.h"
54 #include "chrome/common/chrome_switches.h" 53 #include "chrome/common/chrome_switches.h"
55 #include "chrome/common/pref_names.h" 54 #include "chrome/common/pref_names.h"
56 #include "chrome/grit/generated_resources.h" 55 #include "chrome/grit/generated_resources.h"
57 #include "components/bookmarks/common/bookmark_pref_names.h" 56 #include "components/bookmarks/common/bookmark_pref_names.h"
57 #include "components/prefs/pref_service.h"
58 #include "components/translate/core/browser/language_state.h" 58 #include "components/translate/core/browser/language_state.h"
59 #include "content/public/browser/native_web_keyboard_event.h" 59 #include "content/public/browser/native_web_keyboard_event.h"
60 #include "content/public/browser/notification_details.h" 60 #include "content/public/browser/notification_details.h"
61 #include "content/public/browser/notification_service.h" 61 #include "content/public/browser/notification_service.h"
62 #include "content/public/browser/notification_source.h" 62 #include "content/public/browser/notification_source.h"
63 #include "content/public/browser/web_contents.h" 63 #include "content/public/browser/web_contents.h"
64 #include "extensions/browser/extension_registry.h" 64 #include "extensions/browser/extension_registry.h"
65 #include "extensions/browser/extension_system.h" 65 #include "extensions/browser/extension_system.h"
66 #include "extensions/common/constants.h" 66 #include "extensions/common/constants.h"
67 #include "grit/components_strings.h" 67 #include "grit/components_strings.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
898 void BrowserWindowCocoa::UnhideDownloadShelf() { 898 void BrowserWindowCocoa::UnhideDownloadShelf() {
899 GetDownloadShelf()->Unhide(); 899 GetDownloadShelf()->Unhide();
900 } 900 }
901 901
902 void BrowserWindowCocoa::HideDownloadShelf() { 902 void BrowserWindowCocoa::HideDownloadShelf() {
903 GetDownloadShelf()->Hide(); 903 GetDownloadShelf()->Hide();
904 StatusBubble* statusBubble = GetStatusBubble(); 904 StatusBubble* statusBubble = GetStatusBubble();
905 if (statusBubble) 905 if (statusBubble)
906 statusBubble->Hide(); 906 statusBubble->Hide();
907 } 907 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698