summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-20 10:18:47 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-20 10:18:47 +0000
commitb8e681e834aa0159c929975ba8b0fdd4ff921823 (patch)
tree85605c0a5db726d4f0343cb05c192a1ea887dab6 /chrome/browser/ui/cocoa
parentb874e3b554fba3ee2590bcdf5e8812b3a12541b3 (diff)
downloadchromium_src-b8e681e834aa0159c929975ba8b0fdd4ff921823.zip
chromium_src-b8e681e834aa0159c929975ba8b0fdd4ff921823.tar.gz
chromium_src-b8e681e834aa0159c929975ba8b0fdd4ff921823.tar.bz2
Add method skeleton for showing website settings.
Add command line flag for enabling website settings. This is the first CL of a series of CL for add website settings. Next CLs are: https://chromiumcodereview.appspot.com/9378014 (WIP) https://chromiumcodereview.appspot.com/9379016/ BUG=113688 TEST=none Review URL: https://chromiumcodereview.appspot.com/9383005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa')
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.h5
-rw-r--r--chrome/browser/ui/cocoa/browser_window_cocoa.mm8
-rw-r--r--chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm4
3 files changed, 15 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 73d0891c..5c8d09b 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -103,6 +103,11 @@ class BrowserWindowCocoa : public BrowserWindow,
const GURL& url,
const content::SSLStatus& ssl,
bool show_history) OVERRIDE;
+ virtual void ShowWebsiteSettings(Profile* profile,
+ TabContentsWrapper* tab_contents_wrapper,
+ const GURL& url,
+ const content::SSLStatus& ssl,
+ bool show_history) OVERRIDE;
virtual void ShowAppMenu() OVERRIDE;
virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
bool* is_keyboard_shortcut) OVERRIDE;
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 6bb995d..d001852 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -476,6 +476,14 @@ void BrowserWindowCocoa::ShowPageInfo(Profile* profile,
browser::ShowPageInfoBubble(window(), profile, url, ssl, show_history);
}
+void BrowserWindowCocoa::ShowWebsiteSettings(
+ Profile* profile,
+ TabContentsWrapper* tab_contents_wrapper,
+ const GURL& url,
+ const content::SSLStatus& ssl,
+ bool show_history) {
+}
+
void BrowserWindowCocoa::ShowAppMenu() {
// No-op. Mac doesn't support showing the menus via alt keys.
}
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
index f22530b..c6c23d7 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.mm
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -108,7 +108,7 @@ bool LocationIconDecoration::OnMousePressed(NSRect frame) {
return true;
}
Browser* browser = Browser::GetBrowserForController(&controller, NULL);
- browser->ShowPageInfo(nav_entry->GetURL(), nav_entry->GetSSL(), true);
+ browser->ShowPageInfo(tab, nav_entry->GetURL(), nav_entry->GetSSL(), true);
return true;
}