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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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 #include "chrome/browser/ui/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 #include "chrome/browser/ui/views/status_bubble_views.h" 74 #include "chrome/browser/ui/views/status_bubble_views.h"
75 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 75 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
76 #include "chrome/browser/ui/views/tabs/tab.h" 76 #include "chrome/browser/ui/views/tabs/tab.h"
77 #include "chrome/browser/ui/views/tabs/tab_strip.h" 77 #include "chrome/browser/ui/views/tabs/tab_strip.h"
78 #include "chrome/browser/ui/views/toolbar_view.h" 78 #include "chrome/browser/ui/views/toolbar_view.h"
79 #include "chrome/browser/ui/views/update_recommended_message_box.h" 79 #include "chrome/browser/ui/views/update_recommended_message_box.h"
80 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 80 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
81 #include "chrome/browser/ui/window_sizer/window_sizer.h" 81 #include "chrome/browser/ui/window_sizer/window_sizer.h"
82 #include "chrome/common/chrome_notification_types.h" 82 #include "chrome/common/chrome_notification_types.h"
83 #include "chrome/common/chrome_switches.h" 83 #include "chrome/common/chrome_switches.h"
84 #include "chrome/common/extensions/extension_resource.h"
85 #include "chrome/common/pref_names.h" 84 #include "chrome/common/pref_names.h"
86 #include "chrome/common/url_constants.h" 85 #include "chrome/common/url_constants.h"
87 #include "content/public/browser/download_manager.h" 86 #include "content/public/browser/download_manager.h"
88 #include "content/public/browser/native_web_keyboard_event.h" 87 #include "content/public/browser/native_web_keyboard_event.h"
89 #include "content/public/browser/notification_service.h" 88 #include "content/public/browser/notification_service.h"
90 #include "content/public/browser/render_view_host.h" 89 #include "content/public/browser/render_view_host.h"
91 #include "content/public/browser/render_widget_host.h" 90 #include "content/public/browser/render_widget_host.h"
92 #include "content/public/browser/user_metrics.h" 91 #include "content/public/browser/user_metrics.h"
93 #include "content/public/browser/web_contents.h" 92 #include "content/public/browser/web_contents.h"
94 #include "content/public/browser/web_contents_view.h" 93 #include "content/public/browser/web_contents_view.h"
(...skipping 2622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2717 2716
2718 Browser* modal_browser = 2717 Browser* modal_browser =
2719 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); 2718 chrome::FindBrowserWithWebContents(active_dialog->web_contents());
2720 if (modal_browser && (browser_ != modal_browser)) { 2719 if (modal_browser && (browser_ != modal_browser)) {
2721 modal_browser->window()->FlashFrame(true); 2720 modal_browser->window()->FlashFrame(true);
2722 modal_browser->window()->Activate(); 2721 modal_browser->window()->Activate();
2723 } 2722 }
2724 2723
2725 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); 2724 AppModalDialogQueue::GetInstance()->ActivateModalDialog();
2726 } 2725 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/create_application_shortcut_view.cc ('k') | chrome/browser/ui/views/infobars/extension_infobar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698